Merge branch 'master' of https://github.com/dotnet/wpf into netstandard2.0

Author: wieslawsoltes

.gitignore

@@ -331,3 +331,16 @@ ASALocalRun/
 /.dotnet
 /.packages
 /.tools/vswhere/2.5.2
+
+### OSX ###
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

Directory.Build.props

@@ -3,12 +3,6 @@
  <PropertyGroup>
  <ImportNetSdkFromRepoToolset>false</ImportNetSdkFromRepoToolset>
 
- <!-- This repo builds a transport package - we don't ship from here -->
- <IsShipping Condition="'$(IsShipping)'==''">false</IsShipping>
- 
- <!-- Disable localization - re-enable this later when localization is needed --> 
- <EnableXlfLocalization>false</EnableXlfLocalization>
- 
  <PublishWindowsPdb>true</PublishWindowsPdb>
  </PropertyGroup>
 

Documentation/getting-started.md

@@ -36,6 +36,8 @@ For conceptual documentation (architecture, how-tos, etc.) most of the [document
 
 * WPF Applications crash with `System.TypeLoadException` when the Visual C++ Redistributable for Visual Studio 2017 is not installed. The latest version of VC++ redistributable can be obtained from [the Visual C++ downloads page](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads). This dependency will be removed prior to .NET Core 3.0 final release.
  * This is tracked by [#37](https://github.com/dotnet/wpf/issues/37).
+* WPF Applications crash with 'Module not found' with a stack originating from wpfgfx_cor3.dll (see [#167](https://github.com/dotnet/wpf/issues/167)). This is due to a dependency on d3d_compiler.dll added in .NET Framework 4.7. The workarounds linked [here](https://support.microsoft.com/en-us/help/4020302/the-net-framework-4-7-installation-is-blocked-on-windows-7-windows-ser) will fix this issue. This dependency will be handled prior to .NET Core 3.0 final release.
+ * This is tracked by [#189](https://github.com/dotnet/wpf/issues/189)
 
 ## Missing features
 

azure-pipelines.yml

@@ -9,9 +9,6 @@ variables:
  # clean the local repo on the build agents
  Build.Repository.Clean: true
 
- # This project only builds a transport package
- _IsShipping: false
-
  # Set some variables based on build conditions
  ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
  _HelixType: build/product

eng/Version.Details.xml

@@ -2,9 +2,9 @@
 <Dependencies>
  <ProductDependencies></ProductDependencies>
  <ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18607.6">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.18620.6">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e8b77277ce388a80223941927a0e4388d02b7233</Sha>
+ <Sha>f3336ecb1009ee5c6f68142c0d05a68bc5609a60</Sha>
  </Dependency>
  </ToolsetDependencies>
 </Dependencies>

eng/build.yml

@@ -67,7 +67,7 @@ phases:
  $(_PublishArgs)
  $(_SignArgs)
  $(_OfficialBuildIdArgs)
- /p:Platform=$(_Platform) /p:IsShipping=$(_IsShipping) 
+ /p:Platform=$(_Platform)
  displayName: Windows Build / Publish
  condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
 

eng/common/CIBuild.cmd

@@ -1,3 +1,2 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
-exit /b %ErrorLevel%
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"

eng/common/PublishBuildAssets.cmd

@@ -1,3 +1,3 @@
 @echo off
-powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -msbuildEngine dotnet -restore -execute /p:PublishBuildAssets=true /p:SdkTaskProjects=PublishBuildAssets.proj %*"
+powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -msbuildEngine dotnet -restore -execute -binaryLog /p:PublishBuildAssets=true /p:SdkTaskProjects=PublishBuildAssets.proj %*"
 exit /b %ErrorLevel%

eng/common/PublishToPackageFeed.proj

@@ -0,0 +1,37 @@
+<!--
+ This MSBuild file is intended to be used as the body of the default 
+ publishing release pipeline. The release pipeline will use this file
+ to invoke the PushToStaticFeed task that will read the build asset
+ manifest and publish the assets described in the manifest to
+ informed target feeds.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <TargetFramework>netcoreapp2.1</TargetFramework>
+ </PropertyGroup>
+
+ <Import Project="$(MSBuildThisFileDirectory)MicrosoftDotNetBuildTasksFeedVersion.props" />
+ <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" />
+
+ <Target Name="PublishToFeed">
+ <Error Condition="'$(TargetStaticFeed)' == ''" Text="TargetStaticFeed: Target feed for publishing assets wasn't provided." />
+ <Error Condition="'$(AccountKeyToStaticFeed)' == ''" Text="AccountKeyToStaticFeed: Account key for target feed wasn't provided." />
+ <Error Condition="'$(FullPathAssetManifest)' == ''" Text="Full path to asset manifest wasn't provided." />
+ <Error Condition="'$(FullPathBlobBasePath)' == '' AND '$(FullPathPackageBasePath)' == ''" Text="A valid full path to BlobBasePath of PackageBasePath is required." />
+
+ <PushArtifactsInManifestToFeed
+ ExpectedFeedUrl="$(TargetStaticFeed)"
+ AccountKey="$(AccountKeyToStaticFeed)"
+ Overwrite="$(OverrideAssetsWithSameName)"
+ PassIfExistingItemIdentical="$(PassIfExistingItemIdentical)"
+ MaxClients="$(MaxParallelUploads)"
+ UploadTimeoutInMinutes="$(MaxUploadTimeoutInMinutes)"
+ AssetManifestPath="$(FullPathAssetManifest)"
+ BlobAssetsBasePath="$(FullPathBlobBasePath)"
+ PackageAssetsBasePath="$(FullPathPackageBasePath)" />
+ </Target>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
+ </ItemGroup>
+</Project>

eng/common/README.md

@@ -0,0 +1,28 @@
+# Don't touch this folder
+
+  uuuuuuuuuuuuuuuuuuuu
+  u" uuuuuuuuuuuuuuuuuu "u
+  u" u$$$$$$$$$$$$$$$$$$$$u "u
+  u" u$$$$$$$$$$$$$$$$$$$$$$$$u "u
+  u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
+  u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
+ u" u$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$u "u
+ $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
+ $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
+ $ $$$" ... "$... ...$" ... "$$$ ... "$$$ $
+ $ $$$u `"$$$$$$$ $$$ $$$$$ $$ $$$ $$$ $
+ $ $$$$$$uu "$$$$ $$$ $$$$$ $$ """ u$$$ $
+ $ $$$""$$$ $$$$ $$$u "$$$" u$$ $$$$$$$$ $
+ $ $$$$....,$$$$$..$$$$$....,$$$$..$$$$$$$$ $
+ $ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ $
+ "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
+  "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
+  "u "$$$$$$$$$$$$$$$$$$$$$$$$$$$$" u"
+  "u "$$$$$$$$$$$$$$$$$$$$$$$$" u"
+  "u "$$$$$$$$$$$$$$$$$$$$" u"
+  "u """""""""""""""""" u"
+  """"""""""""""""""""
+
+!!! Changes made in this directory are subject to being overwritten by automation !!!
+
+The files in this directory are shared by all Arcade repos and managed by automation. If you need to make changes to these files, open an issue or submit a pull request to https://github.com/dotnet/arcade first.