Skip to content

Commit 1c7687b

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.1xx' into marcpopMSFT-prepforrelease
2 parents c30463d + a6272dd commit 1c7687b

35 files changed

+553
-461
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -97,43 +97,43 @@
9797
<Sha>c3eb162ec7bcf7449ca54b2218ab0d0c4d67c1d0</Sha>
9898
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9999
</Dependency>
100-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24510.2">
100+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-3.24516.15">
101101
<Uri>https://github.com/dotnet/roslyn</Uri>
102-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
102+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
103103
</Dependency>
104104
<!-- Intermediate is necessary for source build. -->
105-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24510.2">
105+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-3.24516.15">
106106
<Uri>https://github.com/dotnet/roslyn</Uri>
107-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
107+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
108108
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
109109
</Dependency>
110-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24510.2">
110+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-3.24516.15">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
112+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24510.2">
114+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-3.24516.15">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
116+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24510.2">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-3.24516.15">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
120+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24510.2">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-3.24516.15">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
124+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24510.2">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-3.24516.15">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
128+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24510.2">
130+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-3.24516.15">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
132+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
133133
</Dependency>
134-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24510.2">
134+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-3.24516.15">
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136-
<Sha>3fd39c8f6c8db918e3184050599c2046997160f1</Sha>
136+
<Sha>3bff3622487486dec7794dfd0c71e05a52c313a4</Sha>
137137
</Dependency>
138138
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rtm.24516.19">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -379,14 +379,14 @@
379379
<Uri>https://github.com/dotnet/test-templates</Uri>
380380
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
381381
</Dependency>
382-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24516.3">
382+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24517.3">
383383
<Uri>https://github.com/dotnet/test-templates</Uri>
384-
<Sha>6f21abef9eda75bcf8e7f4cea899ebf616f4090a</Sha>
384+
<Sha>deb758b7e7750826a75e937c7df5b97f19c510f8</Sha>
385385
</Dependency>
386386
<!-- Intermediate is necessary for source build. -->
387-
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24516.3">
387+
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24517.3">
388388
<Uri>https://github.com/dotnet/test-templates</Uri>
389-
<Sha>6f21abef9eda75bcf8e7f4cea899ebf616f4090a</Sha>
389+
<Sha>deb758b7e7750826a75e937c7df5b97f19c510f8</Sha>
390390
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391391
</Dependency>
392392
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@@ -445,9 +445,9 @@
445445
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
446446
</Dependency>
447447
<!-- Intermediate is necessary for source build. -->
448-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24515.2">
448+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24516.3">
449449
<Uri>https://github.com/dotnet/source-build-externals</Uri>
450-
<Sha>659bf534d9fbf673493b821be99df12032277549</Sha>
450+
<Sha>4df883d781a4290873b3b968afc0ff0df7132507</Sha>
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
@@ -460,34 +460,34 @@
460460
<Uri>https://github.com/dotnet/deployment-tools</Uri>
461461
<Sha>7871ee378dce87b64d930d4f33dca9c888f4034d</Sha>
462462
</Dependency>
463-
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24515.3">
463+
<Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24516.2">
464464
<Uri>https://github.com/dotnet/sourcelink</Uri>
465-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
465+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
466466
</Dependency>
467-
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24515.3">
467+
<Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24516.2">
468468
<Uri>https://github.com/dotnet/sourcelink</Uri>
469-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
469+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
470470
</Dependency>
471-
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24515.3">
471+
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24516.2">
472472
<Uri>https://github.com/dotnet/sourcelink</Uri>
473-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
473+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
474474
</Dependency>
475-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24515.3">
475+
<Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24516.2">
476476
<Uri>https://github.com/dotnet/sourcelink</Uri>
477-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
477+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
478478
</Dependency>
479-
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24515.3">
479+
<Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24516.2">
480480
<Uri>https://github.com/dotnet/sourcelink</Uri>
481-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
481+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
482482
</Dependency>
483-
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24515.3">
483+
<Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24516.2">
484484
<Uri>https://github.com/dotnet/sourcelink</Uri>
485-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
485+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
486486
</Dependency>
487487
<!-- Intermediate is necessary for source build. -->
488-
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24515.3">
488+
<Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24516.2">
489489
<Uri>https://github.com/dotnet/sourcelink</Uri>
490-
<Sha>c490a5fbdc76f8f6870f0a6f6efb74a84e957a8e</Sha>
490+
<Sha>24760f9b1ed7478863d699b7f6634e82d1b25bd1</Sha>
491491
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
492492
</Dependency>
493493
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<PropertyGroup>
9999
<!-- Dependency from https://github.com/dotnet/test-templates -->
100100
<!-- Supported versions -->
101-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24516.3</MicrosoftDotNetTestProjectTemplates90PackageVersion>
101+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24517.3</MicrosoftDotNetTestProjectTemplates90PackageVersion>
102102
</PropertyGroup>
103103
<PropertyGroup>
104104
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -217,14 +217,14 @@
217217
</PropertyGroup>
218218
<PropertyGroup>
219219
<!-- Dependencies from https://github.com/dotnet/roslyn -->
220-
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24510.2</MicrosoftNetCompilersToolsetVersion>
221-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24510.2</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
222-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisPackageVersion>
223-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpPackageVersion>
224-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
225-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
226-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
227-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24510.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
220+
<MicrosoftNetCompilersToolsetVersion>4.12.0-3.24516.15</MicrosoftNetCompilersToolsetVersion>
221+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-3.24516.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
222+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisPackageVersion>
223+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisCSharpPackageVersion>
224+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
225+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
226+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
227+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-3.24516.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
228228
</PropertyGroup>
229229
<PropertyGroup>
230230
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -290,12 +290,12 @@
290290
</PropertyGroup>
291291
<PropertyGroup>
292292
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
293-
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24515.3</MicrosoftBuildTasksGitVersion>
294-
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24515.3</MicrosoftSourceLinkCommonVersion>
295-
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24515.3</MicrosoftSourceLinkAzureReposGitVersion>
296-
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24515.3</MicrosoftSourceLinkGitHubVersion>
297-
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24515.3</MicrosoftSourceLinkGitLabVersion>
298-
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24515.3</MicrosoftSourceLinkBitbucketGitVersion>
293+
<MicrosoftBuildTasksGitVersion>9.0.0-beta.24516.2</MicrosoftBuildTasksGitVersion>
294+
<MicrosoftSourceLinkCommonVersion>9.0.0-beta.24516.2</MicrosoftSourceLinkCommonVersion>
295+
<MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24516.2</MicrosoftSourceLinkAzureReposGitVersion>
296+
<MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24516.2</MicrosoftSourceLinkGitHubVersion>
297+
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24516.2</MicrosoftSourceLinkGitLabVersion>
298+
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24516.2</MicrosoftSourceLinkBitbucketGitVersion>
299299
</PropertyGroup>
300300
<!-- Get .NET Framework reference assemblies from NuGet packages -->
301301
<PropertyGroup>

‎src/Containers/Microsoft.NET.Build.Containers/FallbackToHttpMessageHandler.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,16 @@ namespace Microsoft.NET.Build.Containers;
1212
/// </summary>
1313
internal sealed partial class FallbackToHttpMessageHandler : DelegatingHandler
1414
{
15+
private readonly string _registryName;
1516
private readonly string _host;
1617
private readonly int _port;
1718
private readonly ILogger _logger;
1819
private bool _fallbackToHttp;
1920

20-
public FallbackToHttpMessageHandler(string host, int port, HttpMessageHandler innerHandler, ILogger logger) : base(innerHandler)
21+
public FallbackToHttpMessageHandler(string registryName, string host, int port, HttpMessageHandler innerHandler, ILogger logger)
22+
: base(innerHandler)
2123
{
24+
_registryName = registryName;
2225
_host = host;
2326
_port = port;
2427
_logger = logger;
@@ -38,7 +41,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
3841
{
3942
if (canFallback && _fallbackToHttp)
4043
{
41-
FallbackToHttp(request);
44+
FallbackToHttp(_registryName, request);
4245
canFallback = false;
4346
}
4447

@@ -51,7 +54,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
5154
{
5255
// Try falling back.
5356
_logger.LogTrace("Attempt to fall back to http for {uri}.", uri);
54-
FallbackToHttp(request);
57+
FallbackToHttp(_registryName, request);
5558
HttpResponseMessage response = await base.SendAsync(request, cancellationToken).ConfigureAwait(false);
5659

5760
// Fall back was successful. Use http for all new requests.
@@ -76,10 +79,22 @@ internal static bool ShouldAttemptFallbackToHttp(HttpRequestException exception)
7679
return exception.HttpRequestError == HttpRequestError.SecureConnectionError;
7780
}
7881

79-
private static void FallbackToHttp(HttpRequestMessage request)
82+
private static bool RegistryNameContainsPort(string registryName)
83+
{
84+
// use `container` scheme which does not have a default port.
85+
return new Uri($"container://{registryName}").Port != -1;
86+
}
87+
88+
private static void FallbackToHttp(string registryName, HttpRequestMessage request)
8089
{
8190
var uriBuilder = new UriBuilder(request.RequestUri!);
8291
uriBuilder.Scheme = "http";
92+
if (RegistryNameContainsPort(registryName) == false)
93+
{
94+
// registeryName does not contains port number, so reset the port number to -1, otherwise it will be https default port 443
95+
uriBuilder.Port = -1;
96+
}
97+
8398
request.RequestUri = uriBuilder.Uri;
8499
}
85100
}

‎src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ internal DefaultRegistryAPI(string registryName, Uri baseUri, bool isInsecureReg
3737

3838
private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger logger, bool isInsecureRegistry, RegistryMode mode)
3939
{
40-
HttpMessageHandler innerHandler = CreateHttpHandler(baseUri, isInsecureRegistry, logger);
40+
HttpMessageHandler innerHandler = CreateHttpHandler(registryName, baseUri, isInsecureRegistry, logger);
4141

4242
HttpMessageHandler clientHandler = new AuthHandshakeMessageHandler(registryName, innerHandler, logger, mode);
4343

@@ -56,7 +56,7 @@ private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger
5656
return client;
5757
}
5858

59-
private static HttpMessageHandler CreateHttpHandler(Uri baseUri, bool allowInsecure, ILogger logger)
59+
private static HttpMessageHandler CreateHttpHandler(string registryName, Uri baseUri, bool allowInsecure, ILogger logger)
6060
{
6161
var socketsHttpHandler = new SocketsHttpHandler()
6262
{
@@ -75,7 +75,7 @@ private static HttpMessageHandler CreateHttpHandler(Uri baseUri, bool allowInsec
7575
RemoteCertificateValidationCallback = IgnoreCertificateErrorsForSpecificHost(baseUri.Host)
7676
};
7777

78-
return new FallbackToHttpMessageHandler(baseUri.Host, baseUri.Port, socketsHttpHandler, logger);
78+
return new FallbackToHttpMessageHandler(registryName, baseUri.Host, baseUri.Port, socketsHttpHandler, logger);
7979
}
8080

8181
private static RemoteCertificateValidationCallback IgnoreCertificateErrorsForSpecificHost(string host)

‎src/Installer/redist-installer/redist-installer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<BundleRuntimePacks Condition="'$(BundleRuntimePacks)' == '' and '$(DotNetBuildSourceOnly)' == 'true'">true</BundleRuntimePacks>
1111
<!-- DotNetBuildOrchestrator is (currently) needed in order to obtain NuGet packages from the runtime build. -->
1212
<BundleNativeAotCompiler Condition="'$(BundleNativeAotCompiler)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(SourceBuildUseMonoRuntime)' != 'true' and '$(DotNetBuildOrchestrator)' == 'true'">true</BundleNativeAotCompiler>
13+
<IsShippingPackage>true</IsShippingPackage>
1314
</PropertyGroup>
1415

1516
<ItemGroup>

‎src/Installer/redist-installer/targets/GenerateLayout.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<!-- In unified build, the layout does match, so use the runtime package versions rather than the VS redist versions -->
1212
<AspNetCoreBlobVersion>$(MicrosoftAspNetCoreAppRefInternalPackageVersion)</AspNetCoreBlobVersion>
1313

14-
<NetRuntimeBlobVersion>$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)</NetRuntimeBlobVersion>
15-
<NetRuntimeBlobVersion Condition=" '$(DotNetBuildOrchestrator)' == 'true' ">$(MicrosoftNETCoreAppRuntimePackageVersion)</NetRuntimeBlobVersion>
14+
<NetRuntimeBlobVersion>$(MicrosoftNETCorePlatformsPackageVersion)</NetRuntimeBlobVersion>
1615

1716
<WindowsDesktopBlobVersion>$(VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion)</WindowsDesktopBlobVersion>
1817
<WindowsDesktopBlobVersion Condition=" '$(DotNetBuildOrchestrator)' == 'true' ">$(MicrosoftWindowsDesktopAppRuntimePackageVersion)</WindowsDesktopBlobVersion>

‎src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
66
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
77
<add key="darc-pub-dotnet-aspnetcore-3cc83de" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3cc83de3/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
89
</packageSources>
910
</configuration>

‎src/StaticWebAssetsSdk/Tasks/ApplyCompressionNegotiation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System.Diagnostics;
5+
using System.Globalization;
56
using Microsoft.Build.Framework;
67
using Microsoft.NET.Sdk.StaticWebAssets.Tasks;
78

@@ -102,7 +103,7 @@ public override bool Execute()
102103
{
103104
Name = "Content-Encoding",
104105
Value = compressedAsset.AssetTraitValue,
105-
Quality = Math.Round(1.0 / (length + 1), 12).ToString("F12")
106+
Quality = Math.Round(1.0 / (length + 1), 12).ToString("F12", CultureInfo.InvariantCulture)
106107
};
107108
Log.LogMessage(MessageImportance.Low, " Created Content-Encoding selector for compressed asset '{0}' with size '{1}' is '{2}'", encodingSelector.Value, encodingSelector.Quality, relatedEndpointCandidate.Route);
108109
var endpointCopy = new StaticWebAssetEndpoint

0 commit comments

Comments
 (0)