Tweak to align to output control variables

Author: steveisok

Directory.Build.props

@@ -23,31 +23,16 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
+  <Import Project="eng/OSArch.props" />
+  <Import Project="eng/RuntimeIdentifiers.props" />
+
   <!--
-    $(TargetOS) - target operating system (win, linux, osx). Defaults to host OS.
-    $(TargetArch) - architecture to test (x64, x86, arm, arm64). Defaults to host architecture.
-    $(TargetRid) - the runtime identifier (rid) to against (win-x64, linux-arm64, linux-musl-x64, etc).
     $(Configuration) - configuration to test (Debug, Release). Defaults to Debug.
     $(ArtifactsBinDir) - artifacts\bin directory
   -->
 
-  <PropertyGroup Condition="'$(TargetOS)' == ''">
-    <TargetOS>linux</TargetOS>
-    <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">Windows_NT</TargetOS>
-    <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">linux</TargetOS>
-    <TargetOS Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">osx</TargetOS>
-  </PropertyGroup>
-
   <PropertyGroup>
-    <TargetArch Condition="'$(TargetArch)' == ''">$(Platform)</TargetArch>
-    <TargetArch Condition="'$(TargetArch)' == 'AnyCpu'">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</TargetArch>
-    <ArtifactsBinNativeDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(TargetOS).$(TargetArch).$(Configuration)'))</ArtifactsBinNativeDir>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetRid)' == ''">
-    <TargetRidOS>$(TargetOS)</TargetRidOS>
-    <TargetRidOS Condition="'$(TargetOS)' == 'Windows_NT'">win</TargetRidOS>
-    <TargetRid>$(TargetRidOS)-$(TargetArch)</TargetRid>
+    <ArtifactsBinNativeDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', '$(TargetOS).$(TargetArchitecture).$(Configuration)'))</ArtifactsBinNativeDir>
   </PropertyGroup>
 
   <PropertyGroup>

diagnostics.yml

@@ -77,11 +77,11 @@ extends:
             artifactUploadPath: bin
           - configuration: Release
             architecture: x86
-            artifactUploadPath: bin/Windows_NT.x86.Release
+            artifactUploadPath: bin/windows.x86.Release
           - ${{ if ne(variables['System.TeamProject'], 'public') }}:
             - configuration: Release
               architecture: arm64
-              artifactUploadPath: bin/Windows_NT.arm64.Release
+              artifactUploadPath: bin/windows.arm64.Release
 
       - template: /eng/pipelines/build.yml
         parameters:

documentation/building/windows-instructions.md

@@ -94,7 +94,7 @@ build.cmd
 [Lots of build spew]
 
 BUILD: Repo sucessfully built.
-BUILD: Product binaries are available at c:\git\diagnostics\artifacts\Debug\bin\Windows_NT.x64
+BUILD: Product binaries are available at c:\git\diagnostics\artifacts\Debug\bin\windows.x64
 ```
 
 To build for x86:

documentation/using-sos-private-build.md

@@ -9,14 +9,14 @@ Before we can use the private build, of course, we must build it first. [Here](h
 On Windows, [Debugging Tools for Windows](https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/debugger-download-tools) (aka WinDBG) automatically loads a shipped version of sos.dll from the extension gallery whenever it notices a managed runtime is loaded. In order to avoid that behavior, we need to make sure sos is loaded before it encounters the managed runtime, for the launch scenario, we can do this before running anything.
 
 ```
-0:000> .load <reporoot>\artifacts\bin\Windows_NT.x64.Debug\sos.dll
+0:000> .load <reporoot>\artifacts\bin\windows.x64.Debug\sos.dll
 ```
 
 In the attach scenario, we need to do things differently. We couldn't stop WinDBG from loading the shipped sos, but we can replace it.
 
 ```
 0:000> .unload sos
-0:000> .load <reporoot>\artifacts\bin\Windows_NT.x64.Debug\sos.dll
+0:000> .load <reporoot>\artifacts\bin\windows.x64.Debug\sos.dll
 ```
 
 This will ensure you are using your own sos.dll, of course you might have a different full path to `sos.dll`.

eng/Build-Native.cmd

@@ -35,7 +35,7 @@ if /i "%PROCESSOR_ARCHITECTURE%" == "arm64" set __TargetArch=arm64
 if /i "%PROCESSOR_ARCHITECTURE%" == "x86" set __TargetArch=x86
 set __HostArch=
 set __BuildType=Debug
-set __TargetOS=Windows_NT
+set __TargetOS=windows
 set __BuildNative=1
 set __CI=0
 set __Verbosity=minimal
@@ -118,7 +118,7 @@ set "__CMakeBinDir=%__BinDir%"
 set "__CMakeBinDir=%__CMakeBinDir:\=/%"
 
 :: Common msbuild arguments
-set "__CommonBuildArgs=/v:!__Verbosity! /p:Configuration=%__BuildType% /p:TargetOS=%__TargetOS% /p:TargetArch=%__TargetArch% %__UnprocessedBuildArgs%"
+set "__CommonBuildArgs=/v:!__Verbosity! /p:Configuration=%__BuildType% /p:TargetOS=%__TargetOS% /p:TargetArchitecture=%__TargetArch% %__UnprocessedBuildArgs%"
 
 if not exist "%__BinDir%"           md "%__BinDir%"
 if not exist "%__IntermediatesDir%" md "%__IntermediatesDir%"

eng/InstallNativePackages.targets

@@ -1,7 +1,7 @@
 <!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
   <!--
-    $(ArtifactsBinNativeDir) - Native artifacts directory (e.g. artifacts\bin\Windows_NT.x64.Debug).
+    $(ArtifactsBinNativeDir) - Native artifacts directory (e.g. artifacts\bin\windows.x64.Debug).
     $(TargetRid) - Target runtime identifier (e.g. win-x64, linux-x64, osx-x64).
 
     From Versions.props:
@@ -21,7 +21,7 @@
   -->
 
   <ItemGroup>
-    <PackageDownload Include="Microsoft.DiaSymReader.Native" Version="[$(MicrosoftDiaSymReaderNativeVersion)]" Condition="'$(OS)' == 'Windows_NT'" />
+    <PackageDownload Include="Microsoft.DiaSymReader.Native" Version="[$(MicrosoftDiaSymReaderNativeVersion)]" Condition="'$(BuildOS)' == 'windows'" />
     <PackageDownload Include="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimewinx64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'win-x64'"/>
     <PackageDownload Include="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimewinarm64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'win-arm64'"/>
     <PackageDownload Include="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimelinuxx64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'linux-x64'"/>
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageSourceFiles Include="$(NuGetPackageRoot)microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\$(TargetRid)\native\*" Condition="'$(OS)' == 'Windows_NT'" />
+    <PackageSourceFiles Include="$(NuGetPackageRoot)microsoft.diasymreader.native\$(MicrosoftDiaSymReaderNativeVersion)\runtimes\$(TargetRid)\native\*" Condition="'$(BuildOS)' == 'windows'" />
     <PackageSourceFiles Include="$(NuGetPackageRoot)runtime.win-x64.microsoft.dotnet.cdac.transport\$(runtimewinx64MicrosoftDotNetCdacTransportVersion)\runtimes\win-x64\native\*" Condition="'$(TargetRid)' == 'win-x64'" />
     <PackageSourceFiles Include="$(NuGetPackageRoot)runtime.win-arm64.microsoft.dotnet.cdac.transport\$(runtimewinarm64MicrosoftDotNetCdacTransportVersion)\runtimes\win-arm64\native\*" Condition="'$(TargetRid)' == 'win-arm64'" />
     <PackageSourceFiles Include="$(NuGetPackageRoot)runtime.linux-x64.microsoft.dotnet.cdac.transport\$(runtimelinuxx64MicrosoftDotNetCdacTransportVersion)\runtimes\linux-x64\native\*" Condition="'$(TargetRid)' == 'linux-x64'" />

eng/InstallRuntimes.proj

@@ -1,7 +1,7 @@
 <!-- All Rights Reserved. Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project Sdk="Microsoft.Build.NoTargets">
   <!--
-    $(TargetArch) - architecture to test (x64, x86, arm, arm64). Defaults to x64.
+    $(TargetArchitecture) - architecture to test (x64, x86, arm, arm64). Defaults to x64.
     $(LiveRuntimeDir) - path to the locally built runtime to use for testing.
 
     From Versions.props:
@@ -22,18 +22,18 @@
     <LiveRuntimeDir Condition="'$(LiveRuntimeDir)' != ''">$([MSBuild]::NormalizePath('$(LiveRuntimeDir)'))</LiveRuntimeDir>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetArch)' != 'x86'">
+  <PropertyGroup Condition="'$(TargetArchitecture)' != 'x86'">
     <DotNetInstallRoot>$(RepoRoot).dotnet-test\</DotNetInstallRoot>
     <RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE</RegistryRoot>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetArch)' == 'x86'">
+  <PropertyGroup Condition="'$(TargetArchitecture)' == 'x86'">
     <DotNetInstallRoot>$(RepoRoot).dotnet-test\x86\</DotNetInstallRoot>
     <RegistryRoot>HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node</RegistryRoot>
   </PropertyGroup>
 
   <PropertyGroup>
-    <CommonInstallArgs>-NoPath -SkipNonVersionedFiles -Architecture $(BuildArch) -InstallDir $(DotNetInstallRoot)</CommonInstallArgs>
+    <CommonInstallArgs>-NoPath -SkipNonVersionedFiles -Architecture $(TargetArchitecture) -InstallDir $(DotNetInstallRoot)</CommonInstallArgs>
     <DotNetInstallDir>$([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRefVersion)'))</DotNetInstallDir>
     <TestConfigFileName>$(DotNetInstallRoot)Debugger.Tests.Versions.txt</TestConfigFileName>
   </PropertyGroup>

eng/OSArch.props

@@ -0,0 +1,19 @@
+<Project>
+  <!--
+    $(TargetOS) - target operating system (win, linux, osx). Defaults to host OS.
+    $(TargetArchitecture) - architecture to test (x64, x86, arm, arm64). Defaults to host architecture.
+  -->
+  <PropertyGroup>
+    <BuildOS>linux</BuildOS>
+    <BuildOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</BuildOS>
+    <BuildOS Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">windows</BuildOS>
+  
+    <TargetOS Condition="'$(TargetOS)' == ''">$(BuildOS)</TargetOS>
+    <HostOS Condition="'$(HostOS)' == ''">$(TargetOS)</HostOS>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(Platform)</TargetArchitecture>
+    <TargetArchitecture  Condition="'$(TargetArchitecture)' == 'AnyCpu'">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant)</TargetArchitecture>
+  </PropertyGroup>
+</Project>

eng/RuntimeIdentifiers.props

@@ -0,0 +1,10 @@
+<Project>
+  <!--
+    $(TargetRid) - the runtime identifier (rid) to against (win-x64, linux-arm64, linux-musl-x64, etc).
+  -->
+  <PropertyGroup Condition="'$(TargetRid)' == ''">
+    <TargetRidOS>$(TargetOS)</TargetRidOS>
+    <TargetRidOS Condition="'$(TargetOS)' == 'windows'">win</TargetRidOS>
+    <TargetRid>$(TargetRidOS)-$(TargetArchitecture)</TargetRid>
+  </PropertyGroup>
+</Project>

eng/build.ps1

@@ -38,9 +38,9 @@ switch ($configuration.ToLower()) {
 $reporoot = Join-Path $PSScriptRoot ".."
 $engroot = Join-Path $reporoot "eng"
 $artifactsdir = Join-Path $reporoot "artifacts"
-$os = "Windows_NT"
+$os = "windows"
 $logdir = Join-Path $artifactsdir "log"
-$logdir = Join-Path $logdir Windows_NT.$architecture.$configuration
+$logdir = Join-Path $logdir windows.$architecture.$configuration
 
 if ($ci) {
     $remainingargs = "-ci " + $remainingargs
@@ -64,7 +64,7 @@ if (-not $skipnative) {
 
 # Install sdk for building, restore and build managed components.
 if (-not $skipmanaged) {
-    Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity /p:TargetOS=$os /p:TargetArch=$architecture /p:TestArchitectures=$architecture $remainingargs"
+    Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity /p:TargetOS=$os /p:TargetArchitecture=$architecture /p:TestArchitectures=$architecture $remainingargs"
 
     if ($lastExitCode -ne 0) {
         exit $lastExitCode
@@ -84,7 +84,7 @@ if ($installruntimes -or $privatebuild) {
       /bl:$logdir\InstallRuntimes.binlog `
       /p:PrivateBuildTesting=$privatebuildtesting `
       /p:TargetOS=$os `
-      /p:TargetArch=$architecture `
+      /p:TargetArchitecture=$architecture `
       /p:TestArchitectures=$architecture `
       /p:LiveRuntimeDir="$liveRuntimeDir"
 }
@@ -102,7 +102,7 @@ if ($test) {
           -ci:$ci `
           /bl:$logdir\Test.binlog `
           /p:TargetOS=$os `
-          /p:TargetArch=$architecture `
+          /p:TargetArchitecture=$architecture `
           /p:TestArchitectures=$architecture `
           /p:DotnetRuntimeVersion="$dotnetruntimeversion" `
           /p:DotnetRuntimeDownloadVersion="$dotnetruntimedownloadversion" `