From 6dc92ab223703b572f2e80d2eb01965f32079c86 Mon Sep 17 00:00:00 2001
From: John Salem <josalem@microsoft.com>
Date: Fri, 7 Sep 2018 16:14:26 -0700
Subject: [PATCH] Process container name to ensure validity

Commit migrated from https://github.com/dotnet/corefx/commit/a3f24d37c96442befc8df679932aae896cc1ca3b
---
 src/libraries/upload-tests.proj | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libraries/upload-tests.proj b/src/libraries/upload-tests.proj
index e5586c8..317ee12 100644
--- a/src/libraries/upload-tests.proj
+++ b/src/libraries/upload-tests.proj
@@ -78,8 +78,12 @@
     <HelixConfigLabel>$(ConfigurationGroup)</HelixConfigLabel>
     <MaxRetryCount>1</MaxRetryCount>
     <TestsBlobPrefix>tests/</TestsBlobPrefix>
-    <!-- Unique container name per build and configuration, e.g., corefx-beta-12345-01-Windows_NT -->
-    <ContainerName Condition="'$(ContainerName)' == ''">corefx-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-$(OSGroup)-$(ArchGroup)</ContainerName>
+    <!-- Unique container name per build and configuration, e.g., corefx-beta-12345-01-windows -->
+    <!-- Azure Storage containers can only contain [a-z, 0-9, -] in their names and $(OSGroup) is "Windows_NT" on Windows... -->
+    <ProcessedOSGroup>$(OSGroup.ToLower())</ProcessedOSGroup>
+    <ProcessedOSGroup Condition="'$(TargetsWindows)' == 'true'">windows</ProcessedOSGroup>
+    <ProcessedArchGroup>$(ArchGroup.ToLower())</ProcessedArchGroup>
+    <ContainerName Condition="'$(ContainerName)' == ''">corefx-$(PreReleaseLabel)-$(BuildNumberMajor)-$(BuildNumberMinor)-$(ProcessedOSGroup)-$(ProcessedArchGroup)</ContainerName>
   </PropertyGroup>
 
   <Target Name="CoreFXPreCloudBuild" >
-- 
2.7.4