PR feedback: sdk 2.2, doc update, inline file write, unsort

chcosta · Apr 9, 2019 · 055c65d · 055c65d
1 parent d2e8954
commit 055c65d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 29 deletions.
diff --git a/Documentation/ArcadeSdk.md b/Documentation/ArcadeSdk.md
@@ -279,7 +279,7 @@ For an architecture specific runtime, list the runtimes under the architecture m
   },
 ```
 
-When the Arcade scripts (`tools.ps1` \ `tools.sh`) are invoked to restore the Arcade SDK, it will also use these values to generate a file named `/artifacts/toolset/DotNetCoreVersions.Generated.props` which will define additional "DotNetCoreRuntimeVersion" item groups.
+When the Arcade toolset is restored, it will generate a file named `/artifacts/toolset/DotNetCoreVersions.Generated.props` that defines additional "DotNetCoreRuntimeVersion" item groups.
 
 /artifacts/DotNetCoreVersions.Generated.props
 

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -78,4 +78,7 @@
       https://dotnet.myget.org/F/symreader/api/v3/index.json
     </RestoreSources>
   </PropertyGroup>
+  <ItemGroup>
+    <DotNetCoreRuntimeVersion Include="2.2.3" />
+  </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview4-010963"
+    "dotnet": "2.2.202"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19207.1",

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets b/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets
@@ -15,15 +15,19 @@
     Ideally we would have msbuild API to do that for an SDK: https://github.com/Microsoft/msbuild/issues/2992
   -->
   <Target Name="__WriteToolsetLocation" Outputs="$(__ToolsetLocationOutputFile)" Condition="'$(__ToolsetLocationOutputFile)' != ''">
-    <WriteLinesToFile File="$(__ToolsetLocationOutputFile)" Lines="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\Build.proj'))" Overwrite="true"/>
+    <WriteLinesToFile File="$(__ToolsetLocationOutputFile)"
+      Lines="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\Build.proj'))"
+      Overwrite="true"/>
     <ItemGroup>
       <FileWrites Include="$(__ToolsetLocationOutputFile)" />
     </ItemGroup>
+
+    <GenerateDotNetVersionsPropsFile
+      DotNetVersionPropsPath="$(ArtifactsToolsetDir)DotNetCoreVersions.Generated.props"
+      GlobalJsonPath="$(RepoRoot)global.json"
+      Condition="'$(__WriteDotNetVersionsPropsFile)' == 'true'" />
   </Target>
 
   <Import Project="..\tools\Imports.targets" Condition="!$(_SuppressSdkImports) and !$(_SuppressAllTargets)" />
   <Import Project="..\tools\Empty.targets" Condition="!$(_SuppressSdkImports) and $(_SuppressAllTargets)"/>
-
-  <Import Project="..\tools\GenerateDotNetVersionsFile.targets" Condition="'$(__WriteDotNetVersionsPropsFile)' == 'true'" />
-
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props
@@ -78,27 +78,27 @@
   -->
   <PropertyGroup>
     <DropAppVersion Condition="'$(DropAppVersion)' == ''">17.144.28413-buildid7983345</DropAppVersion>
-    <MicroBuildCoreVersion Condition="'$(MicroBuildCoreVersion)' == ''">0.2.0</MicroBuildCoreVersion>
     <MicroBuildPluginsSwixBuildVersion Condition="'$(MicroBuildPluginsSwixBuildVersion)' == ''">1.0.422</MicroBuildPluginsSwixBuildVersion>
-    <MicrosoftDiaSymReaderPdb2PdbVersion Condition="'$(MicrosoftDiaSymReaderPdb2PdbVersion)' == ''">1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>
-    <MicrosoftDotNetBuildTasksFeedVersion Condition="'$(MicrosoftDotNetBuildTasksFeedVersion)' == ''">2.2.0-beta.19170.2</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetBuildTasksVisualStudioVersion Condition="'$(MicrosoftDotNetBuildTasksVisualStudioVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksVisualStudioVersion>
+    <MicroBuildCoreVersion Condition="'$(MicroBuildCoreVersion)' == ''">0.2.0</MicroBuildCoreVersion>
     <MicrosoftDotNetIBCMergeVersion Condition="'$(MicrosoftDotNetIBCMergeVersion)' == ''">5.0.6-beta.19203.1</MicrosoftDotNetIBCMergeVersion>
-    <MicrosoftDotNetSignToolVersion Condition="'$(MicrosoftDotNetSignToolVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignToolVersion>
-    <MicrosoftNetFrameworkReferenceAssembliesVersion Condition="'$(MicrosoftNetFrameworkReferenceAssembliesVersion)' == ''">1.0.0-alpha-5</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <MicrosoftNETTestSdkVersion Condition="'$(MicrosoftNETTestSdkVersion)' == ''">15.9.0</MicrosoftNETTestSdkVersion>
-    <MicrosoftSourceLinkVersion Condition="'$(MicrosoftSourceLinkVersion)' == ''">1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
-    <MicrosoftSymbolUploaderBuildTaskVersion Condition="'$(MicrosoftSymbolUploaderBuildTaskVersion)' == ''">1.0.0-beta-63604-05</MicrosoftSymbolUploaderBuildTaskVersion>
+    <MicrosoftNetFrameworkReferenceAssembliesVersion Condition="'$(MicrosoftNetFrameworkReferenceAssembliesVersion)' == ''">1.0.0-alpha-5</MicrosoftNetFrameworkReferenceAssembliesVersion>
     <MicrosoftVSSDKBuildToolsVersion Condition="'$(MicrosoftVSSDKBuildToolsVersion)' == ''">15.1.192</MicrosoftVSSDKBuildToolsVersion>
+    <MicrosoftDiaSymReaderPdb2PdbVersion Condition="'$(MicrosoftDiaSymReaderPdb2PdbVersion)' == ''">1.1.0-beta1-62506-02</MicrosoftDiaSymReaderPdb2PdbVersion>
     <MicrosoftBclJsonSourcesVersion Condition="'$(MicrosoftBclJsonSourcesVersion)' == ''">4.6.0-preview4.19202.2</MicrosoftBclJsonSourcesVersion>
     <RoslynToolsModifyVsixManifestVersion Condition="'$(RoslynToolsModifyVsixManifestVersion)' == ''">1.0.0-beta2-63222-01</RoslynToolsModifyVsixManifestVersion>
     <RoslynToolsNuGetRepackVersion Condition="'$(RoslynToolsNuGetRepackVersion)' == ''">1.0.0-beta3.18526.1</RoslynToolsNuGetRepackVersion>
-    <SNVersion Condition="'$(SNVersion)' == ''">1.0.0</SNVersion>
-    <VSWhereVersion Condition="'$(VSWhereVersion)' == ''">2.5.2</VSWhereVersion>
+    <MicrosoftDotNetSignToolVersion Condition="'$(MicrosoftDotNetSignToolVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetSignToolVersion>
     <XliffTasksVersion Condition="'$(XliffTasksVersion)' == ''">0.2.0-beta-63004-01</XliffTasksVersion>
     <XUnitVersion Condition="'$(XUnitVersion)' == ''">2.4.1-pre.build.4059</XUnitVersion>
     <XUnitRunnerConsoleVersion Condition="'$(XUnitRunnerConsoleVersion)' == ''">$(XUnitVersion)</XUnitRunnerConsoleVersion>
     <XUnitRunnerVisualStudioVersion Condition="'$(XUnitRunnerVisualStudioVersion)' == ''">$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <MicrosoftDotNetBuildTasksFeedVersion Condition="'$(MicrosoftDotNetBuildTasksFeedVersion)' == ''">2.2.0-beta.19170.2</MicrosoftDotNetBuildTasksFeedVersion>
+    <MicrosoftSourceLinkVersion Condition="'$(MicrosoftSourceLinkVersion)' == ''">1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
+    <MicrosoftSymbolUploaderBuildTaskVersion Condition="'$(MicrosoftSymbolUploaderBuildTaskVersion)' == ''">1.0.0-beta-63604-05</MicrosoftSymbolUploaderBuildTaskVersion>
+    <VSWhereVersion Condition="'$(VSWhereVersion)' == ''">2.5.2</VSWhereVersion>
+    <SNVersion Condition="'$(SNVersion)' == ''">1.0.0</SNVersion>
+    <MicrosoftDotNetBuildTasksVisualStudioVersion Condition="'$(MicrosoftDotNetBuildTasksVisualStudioVersion)' == ''">$(ArcadeSdkVersion)</MicrosoftDotNetBuildTasksVisualStudioVersion>
   </PropertyGroup>
 
   <!-- RestoreSources overrides - defines DotNetRestoreSources variable if available -->

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateDotNetVersionsFile.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/GenerateDotNetVersionsFile.targets
-Original file line number
+Diff line change
@@ Expand Up @@
       },
     ```
-    When the Arcade scripts (`tools.ps1` \ `tools.sh`) are invoked to restore the Arcade SDK, it will also use these values to generate a file named `/artifacts/toolset/DotNetCoreVersions.Generated.props` which will define additional "DotNetCoreRuntimeVersion" item groups.
+    When the Arcade toolset is restored, it will generate a file named `/artifacts/toolset/DotNetCoreVersions.Generated.props` that defines additional "DotNetCoreRuntimeVersion" item groups.
     /artifacts/DotNetCoreVersions.Generated.props
@@ Expand Down @@