Update stable name to use RuntimeOS instead of plain OS

Commit migrated from https://github.com/dotnet/corefx/commit/a7596f97ab0589703ca195f32378080f208a6ba4

diff --git a/src/libraries/upload-tests.proj b/src/libraries/upload-tests.proj
index 0a9e7c3..a715724 100644 (file)
--- a/src/libraries/upload-tests.proj
+++ b/src/libraries/upload-tests.proj
@@ -77,10 +77,10 @@
     <HelixArchLabel>$(ArchGroup)</HelixArchLabel>
     <HelixConfigLabel>$(ConfigurationGroup)</HelixConfigLabel>
     <MaxRetryCount>1</MaxRetryCount>
-    <!-- Unique container name and blob prefix per build and configuration, e.g., corefx-tests/master/beta-12345-01/netcoreapp/windowsnt-x64 -->
-    <!-- Azure Storage containers can only contain [a-z, 0-9, -] in their names and $(OSGroup) is "Windows_NT" on Windows... -->
+    <!-- Unique container name and blob prefix per build and configuration, e.g., corefx-tests/master/beta-12345-01/netcoreapp/win10-x64 -->
+    <RuntimeOS Condition="'$(RuntimeOS)' == ''">$(TargetOS)</RuntimeOS>
     <ContainerName Condition="'$(ContainerName)' == '' And '$(IsOfficial)' == 'true'">corefx-tests</ContainerName>
-    <HelixBlobPrefix Condition="'$(HelixBlobPrefix)' == '' And '$(IsOfficial)' == 'true' And '$(Branch)' != ''">$(Branch)/$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)/$(TargetGroup)/$(OSGroup)-$(ArchGroup)/</HelixBlobPrefix>
+    <HelixBlobPrefix Condition="'$(HelixBlobPrefix)' == '' And '$(IsOfficial)' == 'true' And '$(Branch)' != ''">$(Branch)/$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)/$(TargetGroup)/$(RuntimeOS)-$(ArchGroup)/</HelixBlobPrefix>
     <!-- If this is an official build, set the test drop to be public -->
     <IsDropPublic Condition="'$(IsOfficial)' == 'true'">true</IsDropPublic>
   </PropertyGroup>