Skip to content

Commit 285efc1

Browse files
[release/10.0] Source code updates from dotnet/dotnet (#63666)
[release/10.0] Source code updates from dotnet/dotnet
1 parent f7d34bf commit 285efc1

File tree

6 files changed

+285
-284
lines changed

6 files changed

+285
-284
lines changed

eng/Version.Details.props

Lines changed: 92 additions & 92 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 185 additions & 185 deletions
Large diffs are not rendered by default.

eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.1.25420.111"
3+
"version": "10.0.100-rc.1.25451.107"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-rc.1.25420.111",
6+
"dotnet": "10.0.100-rc.1.25451.107",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
2727
"jdk": "latest"
2828
},
2929
"msbuild-sdks": {
30-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104",
31-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25460.104",
32-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25460.104",
30+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25466.101",
31+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25466.101",
32+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25466.101",
3333
"Microsoft.Build.NoTargets": "3.7.0",
3434
"Microsoft.Build.Traversal": "3.4.0"
3535
}

src/Components/Components/src/RouteView.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ public Task SetParametersAsync(ParameterView parameters)
6868
/// Renders the component.
6969
/// </summary>
7070
/// <param name="builder">The <see cref="RenderTreeBuilder"/>.</param>
71+
[UnconditionalSuppressMessage("Trimming", "IL2110", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
7172
[UnconditionalSuppressMessage("Trimming", "IL2111", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
7273
[UnconditionalSuppressMessage("Trimming", "IL2118", Justification = "Layout components are preserved because the LayoutAttribute constructor parameter is correctly annotated.")]
7374
protected virtual void Render(RenderTreeBuilder builder)

0 commit comments

Comments
 (0)