Skip to content

Commit cf6ff50

Browse files
sbomersbomer
committed
Merge remote-tracking branch 'origin/feature/10.0' into validation
2 parents 052713c + cfff39d commit cf6ff50

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

‎eng/Version.Details.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25208.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
3+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25209.3" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
44
<Uri>https://github.com/dotnet/aspnetcore</Uri>
5-
<Sha>335de67d0b94805e96ae70c5b93bafd49f5e9efe</Sha>
5+
<Sha>b3399b82c5f13e3f4ad164656083d37b5c04ea85</Sha>
66
</Dependency>
77
<Dependency Name="Microsoft.Diagnostics.Monitoring" Version="9.0.0-preview.25155.1">
88
<Uri>https://github.com/dotnet/diagnostics</Uri>
@@ -22,45 +22,45 @@
2222
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
2323
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25209.3">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25210.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
27+
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25209.3">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25210.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
31+
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25209.3">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25210.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
35+
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25209.3">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25210.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
39+
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25209.3">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25210.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
43+
<Sha>490307dc9bb09caf016b2fa96005ac8aaa89c4e7</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.615501">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>
4747
<Sha>b1037b7cc1ef0b00a9032f19a83b074a00c9a4b8</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25209.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
49+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.4.25209.13" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5050
<Uri>https://github.com/dotnet/runtime</Uri>
51-
<Sha>4d14dc5b4c685eeca9de610298006f4552e43955</Sha>
51+
<Sha>00b00500cc997a55f17ab50bd6104d50f3f4401c</Sha>
5252
</Dependency>
53-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25208.1" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
53+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25209.3" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
5454
<Uri>https://github.com/dotnet/aspnetcore</Uri>
55-
<Sha>335de67d0b94805e96ae70c5b93bafd49f5e9efe</Sha>
55+
<Sha>b3399b82c5f13e3f4ad164656083d37b5c04ea85</Sha>
5656
</Dependency>
57-
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.4.25209.42">
57+
<Dependency Name="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0" Version="10.0.100-preview.4.25210.19">
5858
<Uri>https://github.com/dotnet/sdk</Uri>
59-
<Sha>2c350ba84a45c44dc60ea4182be77d3abdf73567</Sha>
59+
<Sha>90a1f93877806fe281973ec619c3e30fbbbbc3dc</Sha>
6060
</Dependency>
61-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25209.9" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
61+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.10.0" Version="10.0.0-preview.4.25209.13" CoherentParentDependency="VS.Redist.Common.NetCore.SdkPlaceholder.x64.10.0">
6262
<Uri>https://github.com/dotnet/runtime</Uri>
63-
<Sha>4d14dc5b4c685eeca9de610298006f4552e43955</Sha>
63+
<Sha>00b00500cc997a55f17ab50bd6104d50f3f4401c</Sha>
6464
</Dependency>
6565
</ToolsetDependencies>
6666
</Dependencies>

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@
4848
-->
4949
<PropertyGroup Label="Automated">
5050
<!-- dotnet/arcade references -->
51-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25209.3</MicrosoftDotNetBuildTasksArchivesVersion>
52-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25209.3</MicrosoftDotNetCodeAnalysisVersion>
53-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25209.3</MicrosoftDotNetXUnitExtensionsVersion>
51+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25210.1</MicrosoftDotNetBuildTasksArchivesVersion>
52+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25210.1</MicrosoftDotNetCodeAnalysisVersion>
53+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25210.1</MicrosoftDotNetXUnitExtensionsVersion>
5454
<!-- dotnet/aspnetcore references -->
55-
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25208.1</MicrosoftAspNetCoreAppRuntimewinx64Version>
56-
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25208.1</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
55+
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.4.25209.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
56+
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25209.3</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
5757
<!-- dotnet/command-line-api references -->
5858
<SystemCommandLineVersion>2.0.0-beta5.25170.1</SystemCommandLineVersion>
5959
<!-- dotnet/diagnostics references -->
@@ -62,10 +62,10 @@
6262
<!-- dotnet/roslyn-analyzers -->
6363
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25076.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
6464
<!-- dotnet/runtime references -->
65-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25209.9</MicrosoftNETCoreAppRuntimewinx64Version>
66-
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25209.9</VSRedistCommonNetCoreSharedFrameworkx64100Version>
65+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.4.25209.13</MicrosoftNETCoreAppRuntimewinx64Version>
66+
<VSRedistCommonNetCoreSharedFrameworkx64100Version>10.0.0-preview.4.25209.13</VSRedistCommonNetCoreSharedFrameworkx64100Version>
6767
<!-- dotnet/sdk references -->
68-
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25209.42</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
68+
<VSRedistCommonNetCoreSdkPlaceholderx64100Version>10.0.100-preview.4.25210.19</VSRedistCommonNetCoreSdkPlaceholderx64100Version>
6969
<!-- dotnet/symstore references -->
7070
<MicrosoftFileFormatsVersion>1.0.615501</MicrosoftFileFormatsVersion>
7171
</PropertyGroup>

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-preview.4.25202.23",
3+
"dotnet": "10.0.100-preview.4.25209.42",
44
"runtimes": {
55
"aspnetcore": [
66
"$(MicrosoftAspNetCoreApp80Version)",
@@ -26,7 +26,7 @@
2626
},
2727
"msbuild-sdks": {
2828
"Microsoft.Build.NoTargets": "3.7.0",
29-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3",
30-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3"
29+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25210.1",
30+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25210.1"
3131
}
3232
}

0 commit comments

Comments
 (0)