Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/sdk (#19534)
Browse files Browse the repository at this point in the history
[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
  • Loading branch information
dotnet-maestro[bot] authored Apr 23, 2024
1 parent a9cbccb commit c9449de
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 180 deletions.
132 changes: 66 additions & 66 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24218.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.4.24219.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand All @@ -67,49 +67,49 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24218.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24218.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24218.1</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24223.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24223.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
<dotnetdevcertsPackageVersion>9.0.0-preview.4.24223.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>9.0.0-preview.4.24223.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>9.0.0-preview.4.24223.1</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24218.18</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24218.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24218.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24223.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24223.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24223.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24218.2</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.11.0-1.24222.7</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.7</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24218.7</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24218.7</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24222.8</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.4.24222.8</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.4.24222.8</MicrosoftNETCoreAppRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24218.3</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24218.3</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24218.3</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24218.3</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.4.24220.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.4.24220.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.4.24220.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.4.24220.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- 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. -->
Expand All @@ -120,7 +120,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.27</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.28</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/templates/jobs/vmr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,13 @@ jobs:
displayName: Setup Previously Source-Built SDK
- ${{ if eq(parameters.targetOS, 'windows') }}:
# Node 20.x is a toolset dependency to build aspnetcore
# Keep in sync with aspnetcore: https://github.com/dotnet/aspnetcore/blob/7d5309210d8f7bae8fa074da495e9d009d67f1b4/.azure/pipelines/ci.yml#L719-L722
- task: NodeTool@0
displayName: Install Node 20.x
inputs:
versionSpec: 20.x

- script: |
call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine %devArgument% /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }}
displayName: Build
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24177.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24223.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>689fb2d1b620a9df28c3384d9b208e3654a0f928</Sha>
<Sha>91ce5946fec9f81f15f81d20e1aab63527302410</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24179.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-preview.4.24223.1</PrivateSourceBuiltArtifactsVersion>
<!-- command-line-api dependencies -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
<!-- msbuild dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"tools": {
"dotnet": "9.0.100-preview.4.24178.10"
"dotnet": "9.0.100-preview.4.24223.7"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24177.2"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24223.3"
}
}

This file was deleted.

This file was deleted.

0 comments on commit c9449de

Please sign in to comment.