Skip to content

Commit 1852b61

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-0de3bb13-4b69-4170-8690-7913fba1f701
2 parents e4bbfbf + 95bea78 commit 1852b61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+597
-503
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<add key="darc-int-dotnet-runtime-e77011b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-1/nuget/v3/index.json" />
2828
<!-- End: Package sources from dotnet-runtime -->
2929
<!-- Begin: Package sources from dotnet-templating -->
30+
<add key="darc-pub-dotnet-templating-e07a90b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-e07a90b4/nuget/v3/index.json" />
3031
<!-- End: Package sources from dotnet-templating -->
3132
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3233
<add key="darc-pub-dotnet-windowsdesktop-5307f2a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-5307f2ab/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.100-rc.2.24466.6">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.100">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>a23da1c15c737b5e121650cfa5a86805e74e34fc</Sha>
6+
<Sha>e07a90b4df2f1b41a83064cfa3164611756c3746</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.100-rc.2.24466.6">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.100-rtm.24518.2">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>a23da1c15c737b5e121650cfa5a86805e74e34fc</Sha>
10+
<Sha>e07a90b4df2f1b41a83064cfa3164611756c3746</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.100-rc.2.24466.6">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.100-rtm.24518.2">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>a23da1c15c737b5e121650cfa5a86805e74e34fc</Sha>
15+
<Sha>e07a90b4df2f1b41a83064cfa3164611756c3746</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
@@ -325,22 +325,22 @@
325325
<Sha>1e7a7af6d2417242b244d2a0f4f23fcce8e88d2f</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24515.11">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24518.3">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>3094e2df9783ab0c966fafe5f51f148030686444</Sha>
330+
<Sha>13fe97052e82683ec4c9fc916531eba5c751037f</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24515.11">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24518.3">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>3094e2df9783ab0c966fafe5f51f148030686444</Sha>
334+
<Sha>13fe97052e82683ec4c9fc916531eba5c751037f</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24515.11">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24518.3">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338-
<Sha>3094e2df9783ab0c966fafe5f51f148030686444</Sha>
338+
<Sha>13fe97052e82683ec4c9fc916531eba5c751037f</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24515.11">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24518.3">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343-
<Sha>3094e2df9783ab0c966fafe5f51f148030686444</Sha>
343+
<Sha>13fe97052e82683ec4c9fc916531eba5c751037f</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
345345
</Dependency>
346346
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0">
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24511.3">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24517.1">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>c43ee853e96528e2f2eb0f6d8c151ddc07b6a844</Sha>
456+
<Sha>a2ad736b86ce484df4d2dfc967bd29cd9d1b5de9</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-preview.1.24406.1">

‎eng/Versions.props

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,25 +186,27 @@
186186
187187
Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older
188188
than the very latest, based on what we want the SDK to support. So use a version that matches the version
189-
in minimumMSBuildVersion. In these cases, we don't want to use MicrosoftBuildVersion and other
189+
in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0
190+
to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release.
191+
In these cases, we don't want to use MicrosoftBuildVersion and other
190192
associated properties that are updated by the VMR infrastructure. So, we read this version
191193
from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion,
192194
then use that in Directory.Packages.props.
193195
194196
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
195197
<MicrosoftBuildVersion>17.12.6</MicrosoftBuildVersion>
196198
<MicrosoftBuildLocalizationVersion>17.12.6-preview-24518-05</MicrosoftBuildLocalizationVersion>
197-
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
199+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
198200
</PropertyGroup>
199201
<PropertyGroup>
200202
<!-- Dependencies from https://github.com/dotnet/templating -->
201-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-rc.2.24466.6</MicrosoftTemplateEngineAbstractionsPackageVersion>
203+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100</MicrosoftTemplateEngineAbstractionsPackageVersion>
202204
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
203205
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
204206
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
205207
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
206208
<!-- test dependencies -->
207-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-rc.2.24466.6</MicrosoftTemplateEngineMocksPackageVersion>
209+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-rtm.24518.2</MicrosoftTemplateEngineMocksPackageVersion>
208210
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
209211
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
210212
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -242,9 +244,9 @@
242244
</PropertyGroup>
243245
<PropertyGroup>
244246
<!-- Dependencies from https://github.com/dotnet/razor -->
245-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24515.11</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
246-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24515.11</MicrosoftCodeAnalysisRazorToolingInternalVersion>
247-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24515.11</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
247+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24518.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
248+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24518.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
249+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24518.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
248250
</PropertyGroup>
249251
<PropertyGroup>
250252
<!-- Dependencies from https://github.com/dotnet/wpf -->

‎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/Layout/redist/minimumMSBuildVersion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
17.8.3
1+
17.11.0

‎src/Tasks/Common/Resources/Strings.resx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -940,10 +940,6 @@ You may need to build the project on another operating system or architecture, o
940940
&lt;IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))"&gt;true&lt;/IsTrimmable&gt;</value>
941941
<comment>{StrBegin="NETSDK1212: "}</comment>
942942
</data>
943-
<data name="Net8NotCompatibleWithDev177" xml:space="preserve">
944-
<value>NETSDK1213: Targeting .NET 8.0 or higher in Visual Studio 2022 17.7 is not supported.</value>
945-
<comment>{StrBegin="NETSDK1213: "}</comment>
946-
</data>
947943
<!-- Skipping NETSDK1214 on purpose, as that is "UsingUnsupportedUseUwpFeature" on .NET 8 (see https://github.com/dotnet/sdk/issues/44006) -->
948944
<data name="TargetFrameworkIsNotRecommended" xml:space="preserve">
949945
<value>NETSDK1215: Targeting .NET Standard prior to 2.0 is no longer recommended. See {0} for more details.</value>
@@ -973,9 +969,13 @@ You may need to build the project on another operating system or architecture, o
973969
<value>NETSDK1221: NuGetPackageRoot property is empty so package Microsoft.Net.Sdk.Compilers.Toolset cannot be used but it is recommended because your MSBuild and SDK versions are mismatched. Ensure you are building with '/restore /t:Build' and not '/t:Restore;Build'.</value>
974970
<comment>{StrBegin="NETSDK1221: "}{Locked="NuGetPackageRoot"}{Locked="Microsoft.Net.Sdk.Compilers.Toolset"}{Locked="'/restore /t:Build'"}{Locked="'/t:Restore;Build'"}</comment>
975971
</data>
976-
<data name="PreferNativeArm64IgnoredForNetCoreApp" xml:space="preserve">
972+
<data name="PreferNativeArm64IgnoredForNetCoreApp" xml:space="preserve">
977973
<value>NETSDK1222: PreferNativeArm64 applies only to .NET Framework targets. It is not supported and has no effect for when targeting .NET Core.</value>
978974
<comment>{StrBegin="NETSDK1222: "}</comment>
979975
</data>
980-
<!-- The latest message added is PreferNativeArm64IgnoredForNetCoreApp. Please update this value with each PR to catch parallel PRs both adding a new message -->
976+
<data name="Net9NotCompatibleWithDev1711" xml:space="preserve">
977+
<value>NETSDK1223: Targeting .NET 9.0 or higher in Visual Studio 2022 17.11 is not supported.</value>
978+
<comment>{StrBegin="NETSDK1223: "}</comment>
979+
</data>
980+
<!-- The latest message added is Net9NotCompatibleWithDev1711. Please update this value with each PR to catch parallel PRs both adding a new message -->
981981
</root>

‎src/Tasks/Common/Resources/xlf/Strings.cs.xlf

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)