Skip to content

Commit c9449de

Browse files
[main] Update dependencies from dotnet/sdk (#19534)
[main] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.9.0: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.runtime.linux-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.aspnetcore: from 9.0.0-preview.4.24218.1 to 9.0.0-preview.4.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 9.0.0-preview.4.24218.3 to 9.0.0-preview.4.24220.1 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 9.0.0-preview.4.24218.2 to 9.0.0-preview.4.24219.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.400-beta.24218.1 to 12.8.400-beta.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.400-beta.24218.1 to 8.0.400-beta.24223.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.roslyn: from 4.11.0-1.24218.2 to 4.11.0-1.24222.7 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.msbuild: from 17.11.0-preview-24218-01 to 17.11.0-preview-24222-11 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.11.0-preview.1.27 to 6.11.0-preview.1.28 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 9.0.0-preview.4.24218.7 to 9.0.0-preview.4.24222.8 (parent: Microsoft.NET.Sdk) - Install node 20.x on windows build to fix aspnetcore build - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5 - Rebootstrap VMR with arcade changes - Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5 - Remove patches
1 parent a9cbccb commit c9449de

File tree

8 files changed

+102
-180
lines changed

8 files changed

+102
-180
lines changed

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
</PropertyGroup>
5252
<PropertyGroup>
5353
<!-- Dependency from https://github.com/dotnet/wpf -->
54-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24218.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
54+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24219.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
5555
</PropertyGroup>
5656
<PropertyGroup>
5757
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -67,49 +67,49 @@
6767
</PropertyGroup>
6868
<PropertyGroup>
6969
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
70-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRefPackageVersion>
71-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
72-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
73-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
74-
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24218.1</dotnetdevcertsPackageVersion>
75-
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24218.1</dotnetuserjwtsPackageVersion>
76-
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24218.1</dotnetusersecretsPackageVersion>
70+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefPackageVersion>
71+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
72+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
73+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24223.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
74+
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24223.1</dotnetdevcertsPackageVersion>
75+
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24223.1</dotnetuserjwtsPackageVersion>
76+
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24223.1</dotnetusersecretsPackageVersion>
7777
</PropertyGroup>
7878
<PropertyGroup>
7979
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
8080
</PropertyGroup>
8181
<PropertyGroup>
8282
<!-- Dependencies from https://github.com/dotnet/sdk -->
83-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24218.18</MicrosoftDotNetCommonItemTemplatesPackageVersion>
84-
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24218.18</MicrosoftNETSdkPackageVersion>
85-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24218.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
83+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24223.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
84+
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24223.5</MicrosoftNETSdkPackageVersion>
85+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24223.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
8686
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
8787
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
8888
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependencies from https://github.com/dotnet/roslyn -->
92-
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24218.2</MicrosoftNetCompilersToolsetPackageVersion>
92+
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24222.7</MicrosoftNetCompilersToolsetPackageVersion>
9393
</PropertyGroup>
9494
<PropertyGroup>
9595
<!-- Dependencies from https://github.com/dotnet/corefx -->
96-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCorePlatformsPackageVersion>
96+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCorePlatformsPackageVersion>
9797
</PropertyGroup>
9898
<PropertyGroup>
9999
<!-- Dependencies from https://github.com/dotnet/core-setup -->
100-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.7</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
101-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24218.7</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
102-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
103-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
104-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppRefPackageVersion>
100+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24222.8</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
101+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24222.8</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
102+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
103+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
104+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppRefPackageVersion>
105105
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
106106
</PropertyGroup>
107107
<PropertyGroup>
108108
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
109-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24218.3</MicrosoftWindowsDesktopAppRefPackageVersion>
110-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.3</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
111-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24218.3</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
112-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
109+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24220.1</MicrosoftWindowsDesktopAppRefPackageVersion>
110+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24220.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
111+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24220.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
112+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24220.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
113113
</PropertyGroup>
114114
<PropertyGroup>
115115
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -120,7 +120,7 @@
120120
</PropertyGroup>
121121
<PropertyGroup>
122122
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
123-
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.27</NuGetBuildTasksPackageVersion>
123+
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.28</NuGetBuildTasksPackageVersion>
124124
</PropertyGroup>
125125
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
126126
<PropertyGroup>

eng/pipelines/templates/jobs/vmr-build.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,13 @@ jobs:
230230
displayName: Setup Previously Source-Built SDK
231231
232232
- ${{ if eq(parameters.targetOS, 'windows') }}:
233+
# Node 20.x is a toolset dependency to build aspnetcore
234+
# Keep in sync with aspnetcore: https://github.com/dotnet/aspnetcore/blob/7d5309210d8f7bae8fa074da495e9d009d67f1b4/.azure/pipelines/ci.yml#L719-L722
235+
- task: NodeTool@0
236+
displayName: Install Node 20.x
237+
inputs:
238+
versionSpec: 20.x
239+
233240
- script: |
234241
call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine %devArgument% /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }}
235242
displayName: Build

src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.3">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
7+
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.4.24178.10"
3+
"dotnet": "9.0.100-preview.4.24223.7"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3"
99
}
1010
}

src/SourceBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)