diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0388a65a9e23..092d021323e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -258,26 +258,26 @@ https://github.com/dotnet/runtime 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/windowsdesktop - 283bd6a3f37196bacde89cb76c5157593021cc59 + fed5f2a4e66fe00be8d108e8e153ec3bed34941e - + https://github.com/dotnet/windowsdesktop - 283bd6a3f37196bacde89cb76c5157593021cc59 + fed5f2a4e66fe00be8d108e8e153ec3bed34941e - + https://github.com/dotnet/windowsdesktop - 283bd6a3f37196bacde89cb76c5157593021cc59 + fed5f2a4e66fe00be8d108e8e153ec3bed34941e - + https://github.com/dotnet/windowsdesktop - 283bd6a3f37196bacde89cb76c5157593021cc59 + fed5f2a4e66fe00be8d108e8e153ec3bed34941e - + https://github.com/dotnet/wpf - cbaeca87f0bd676b1ecd869338cf78b22f5295f7 + d73dd1dbd908398cef7f50e57812e55b90ed3676 https://github.com/dotnet/aspnetcore @@ -394,13 +394,13 @@ - + https://github.com/dotnet/winforms - fae358b66661ccf60d44119bf2e0cc87ce8c75d4 + 98c761f4d9863f99cdb48ac9e87feef01d5c595e - + https://github.com/dotnet/wpf - cbaeca87f0bd676b1ecd869338cf78b22f5295f7 + d73dd1dbd908398cef7f50e57812e55b90ed3676 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 007bd7b96c61..8489589698c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,7 +99,7 @@ - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24566.1 @@ -157,9 +157,9 @@ - 10.0.0-alpha.1.24563.2 - 10.0.0-alpha.1.24563.2 - 10.0.0-alpha.1.24563.2 + 10.0.0-alpha.1.24568.1 + 10.0.0-alpha.1.24568.1 + 10.0.0-alpha.1.24568.1 @@ -258,8 +258,8 @@ - 10.0.0-alpha.1.24563.1 - 10.0.0-alpha.1.24563.1 + 10.0.0-alpha.1.24568.1 + 10.0.0-alpha.1.24568.1 diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 06f949160d7f..f988dcd168cf 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -16,6 +16,10 @@ $(ReferencePackagesDir) $([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)')) $(ReferencePackagesDir) + + $([MSBuild]::NormalizeDirectory('$(ProjectDirectory)', 'artifacts')) + $([MSBuild]::NormalizeDirectory('$(RepoArtifactsDir)', 'sb', 'package-cache')) + $(BuildArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir) @@ -557,7 +561,7 @@ - <_InnerPackageCacheFiles Include="$(ProjectDirectory)artifacts/sb/package-cache/**/*" /> + <_InnerPackageCacheFiles Include="$(RepoArtifactsPackageCache)**/*" /> @@ -595,7 +599,7 @@ Outputs="$(BaseIntermediateOutputPath)CleanupRepo.complete" Condition="'$(IsUtilityProject)' != 'true' and '$(CleanWhileBuilding)' == 'true' and - Exists('$(ProjectDirectory)artifacts')"> + Exists('$(RepoArtifactsDir)')"> @@ -612,7 +617,7 @@ - + @@ -621,7 +626,7 @@ Condition="'@(ObjFilesToCopy)' != ''" /> - + diff --git a/src/SourceBuild/content/repo-projects/wpf.proj b/src/SourceBuild/content/repo-projects/wpf.proj index c70e7133379b..ccbb6575b2d0 100644 --- a/src/SourceBuild/content/repo-projects/wpf.proj +++ b/src/SourceBuild/content/repo-projects/wpf.proj @@ -8,7 +8,7 @@ $(BuildArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(BuildArgs) /p:Platform=$(TargetArchitecture) - $(BuildArgs) /p:BuildWithNetFrameworkHostedCompiler=false + $(BuildArgs) /p:BuildWithNetFrameworkHostedCompiler=true