Fix sequencing of MakeCommonResourcesPriFile (dotnet#38707)

* Fix sequencing of MakeCommonResourcesPriFile * Disable pri file generation on allconfigs * Disable testhost binplacing on allconfigurations * Disable uap tool restore without testhost * Manual darc update from build '20190421.1'
kreuwont · Jun 20, 2019 · 375ba8f · 375ba8f
1 parent 10a0741
commit 375ba8f
Show file tree

Hide file tree

Showing 9 changed files with 89 additions and 86 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -322,22 +322,24 @@
     <NetFxPackageRefPath>$(ArtifactsBinDir)pkg\netfx\ref</NetFxPackageRefPath>
     <NetFxPackageRuntimePath>$(ArtifactsBinDir)pkg\netfx\lib</NetFxPackageRuntimePath>
 
+    <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>
+
+    <!-- interop is not available on NETStandard1.0 -->
+    <IncludeDllSafeSearchPathAttribute Condition="'$(TargetFramework)' == 'netstandard1.0'">false</IncludeDllSafeSearchPathAttribute>
+
+    <VersionFileForPackages Condition="'$(VersionFileForPackages)' == ''">$(ArtifactsObjDir)version.txt</VersionFileForPackages>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
     <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
-    <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == 'netcoreapp' AND '$(BuildTests)'!='false'">true</BinPlaceTestSharedFramework>
+    <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == 'netcoreapp'">true</BinPlaceTestSharedFramework>
     <BinPlaceUAPFramework Condition="'$(_bc_TargetGroup)' == 'uap'">true</BinPlaceUAPFramework>
     <BinPlaceNETFXRuntime Condition="'$(_bc_TargetGroup)' == 'netfx'">true</BinPlaceNETFXRuntime>
 
-    <TestHostRootPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(BuildConfiguration)'))</TestHostRootPath>
     <NETCoreAppTestHostFxrPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'host', 'fxr', '$(ProductVersion)'))</NETCoreAppTestHostFxrPath>
     <NETCoreAppTestSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(TestHostRootPath)', 'shared', 'Microsoft.NETCore.App', '$(ProductVersion)'))</NETCoreAppTestSharedFrameworkPath>
-
     <!-- For UAP, we'll produce the layout and hard-link this into each test's directory -->
     <UAPTestSharedFrameworkPath>$(TestHostRootPath)UAPLayout</UAPTestSharedFrameworkPath>
-
-    <!-- interop is not available on NETStandard1.0 -->
-    <IncludeDllSafeSearchPathAttribute Condition="'$(TargetFramework)' == 'netstandard1.0'">false</IncludeDllSafeSearchPathAttribute>
-
-    <VersionFileForPackages Condition="'$(VersionFileForPackages)' == ''">$(ArtifactsObjDir)version.txt</VersionFileForPackages>
   </PropertyGroup>
 
   <!--

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -34,65 +34,65 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>eaa0079941923b4f903344130315f4cd332b84fe</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
     <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19319.2">
       <Uri>https://github.com/dotnet/standard</Uri>
       <Sha>282fd3bcfbe4c33a1adb4b7c9b4e6322772aec16</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19319.8">
+    <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19320.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>776d8732a9c27047a30e8950f363b95e88107693</Sha>
+      <Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190619.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -28,16 +28,16 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Arcade dependencies -->
-    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetApiCompatPackageVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetGenAPIPackageVersion>
-    <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetGenFacadesPackageVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19319.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
-    <MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19319.8</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
-    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetBuildTasksPackagingPackageVersion>
-    <MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetRemoteExecutorPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19319.8</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19319.8</MicrosoftDotNetVersionToolsTasksPackageVersion>
+    <MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetApiCompatPackageVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetGenAPIPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetGenFacadesPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19320.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19320.1</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
+    <MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetBuildTasksPackagingPackageVersion>
+    <MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetRemoteExecutorPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19320.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19320.1</MicrosoftDotNetVersionToolsTasksPackageVersion>
     <!-- Core-setup dependencies -->
     <MicrosoftNETCoreAppPackageVersion>3.0.0-preview7-27817-01</MicrosoftNETCoreAppPackageVersion>
     <MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview7-27817-01</MicrosoftNETCoreDotNetHostPackageVersion>