Merge pull request #5 from umbraco/hotfix/net6-configuration-environment-variable-prefix-workaround

Added workaround for net6 AddEnvironmentVariables(prefix) bug.

Author: sitereactor

src/Directory.Build.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <AssemblyVersion>4.0.0</AssemblyVersion>
-    <InformationalVersion>4.0.0</InformationalVersion>
-    <FileVersion>4.0.0.0</FileVersion>
+    <AssemblyVersion>4.0.1</AssemblyVersion>
+    <InformationalVersion>4.0.1</InformationalVersion>
+    <FileVersion>4.0.1.0</FileVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Company>Umbraco</Company>
     <Copyright>Copyright © Umbraco 2021</Copyright>

src/Umbraco.Cloud.StorageProviders.AzureBlob/AzureBlobComposer.cs

@@ -19,8 +19,13 @@ public void Compose(IUmbracoBuilder builder)
         {
             if (builder == null) throw new ArgumentNullException(nameof(builder));
 
+            /* There's a bug in Microsoft.Extensions.Configuration.EnvironmentVariables @ 6.0.0 WRT env var normalization + AddEnvironmentVariables(prefix) 
+             * See https://github.com/dotnet/runtime/pull/62916, should be resolved upstream in https://github.com/dotnet/runtime/milestone/87
+             * Until then, safest thing to do is explicitly add environment variables using both prefixes.
+             * (otherwise there are issues when folks update TFM to net6) */
             var configuration = new ConfigurationBuilder()
                 .AddEnvironmentVariables("Umbraco:Cloud:")
+                .AddEnvironmentVariables("Umbraco__Cloud__")
                 .Build();
 
             // Get options and manually validate (no need to add them to the service collection)