Skip to content

[main] Update dependencies from dotnet/sdk #19534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dotnet-maestro merged 38 commits into from
Apr 23, 2024
Merged

[main] Update dependencies from dotnet/sdk #19534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9e01ce6
Update dependencies from https://github.com/dotnet/sdk build 20240418.23
dotnet-maestro[bot] Apr 19, 2024
d77d539
Update dependencies from https://github.com/dotnet/sdk build 20240418.24
dotnet-maestro[bot] Apr 19, 2024
abafa61
Update dependencies from https://github.com/dotnet/sdk build 20240418.25
dotnet-maestro[bot] Apr 19, 2024
8f599ad
Update dependencies from https://github.com/dotnet/sdk build 20240418.26
dotnet-maestro[bot] Apr 19, 2024
78a0be0
Update dependencies from https://github.com/dotnet/sdk build 20240418.27
dotnet-maestro[bot] Apr 19, 2024
4f7e98d
Install node 20.x on windows build to fix aspnetcore build
ViktorHofer Apr 19, 2024
c69f62f
Update dependencies from https://github.com/dotnet/sdk build 20240419.1
dotnet-maestro[bot] Apr 19, 2024
1641468
Update dependencies from https://github.com/dotnet/sdk build 20240419.2
dotnet-maestro[bot] Apr 19, 2024
737a4d8
Update dependencies from https://github.com/dotnet/sdk build 20240419.3
dotnet-maestro[bot] Apr 19, 2024
d11ddba
Update dependencies from https://github.com/dotnet/sdk build 20240419.4
dotnet-maestro[bot] Apr 19, 2024
5a85818
Update dependencies from https://github.com/dotnet/sdk build 20240419.5
dotnet-maestro[bot] Apr 19, 2024
7faf089
Update dependencies from https://github.com/dotnet/sdk build 20240419.11
dotnet-maestro[bot] Apr 19, 2024
2a24a90
Update dependencies from https://github.com/dotnet/sdk build 20240419.17
dotnet-maestro[bot] Apr 19, 2024
f8a9dff
Update dependencies from https://github.com/dotnet/sdk build 20240419.21
dotnet-maestro[bot] Apr 19, 2024
dc9a087
Update dependencies from https://github.com/dotnet/sdk build 20240419.24
dotnet-maestro[bot] Apr 20, 2024
5dda3eb
Update dependencies from https://github.com/dotnet/sdk build 20240419.28
dotnet-maestro[bot] Apr 20, 2024
206d100
Update dependencies from https://github.com/dotnet/sdk build 20240419.32
dotnet-maestro[bot] Apr 20, 2024
e21a109
Update dependencies from https://github.com/dotnet/sdk build 20240419.33
dotnet-maestro[bot] Apr 20, 2024
cb46c99
Update dependencies from https://github.com/dotnet/sdk build 20240419.34
dotnet-maestro[bot] Apr 20, 2024
6cc6a9f
Update dependencies from https://github.com/dotnet/sdk build 20240420.1
dotnet-maestro[bot] Apr 20, 2024
245c04e
Update dependencies from https://github.com/dotnet/sdk build 20240421.1
dotnet-maestro[bot] Apr 22, 2024
a79217a
Update dependencies from https://github.com/dotnet/sdk build 20240421.3
dotnet-maestro[bot] Apr 22, 2024
918834e
Update dependencies from https://github.com/dotnet/sdk build 20240421.4
dotnet-maestro[bot] Apr 22, 2024
cde04aa
Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5
RussKie Apr 22, 2024
e4a0db6
Update dependencies from https://github.com/dotnet/sdk build 20240422.3
dotnet-maestro[bot] Apr 22, 2024
ec1d61d
Update dependencies from https://github.com/dotnet/sdk build 20240422.17
dotnet-maestro[bot] Apr 23, 2024
cf089da
Update dependencies from https://github.com/dotnet/sdk build 20240422.18
dotnet-maestro[bot] Apr 23, 2024
b02ddc9
Update dependencies from https://github.com/dotnet/sdk build 20240422.21
dotnet-maestro[bot] Apr 23, 2024
97cd747
Update dependencies from https://github.com/dotnet/sdk build 20240422.22
dotnet-maestro[bot] Apr 23, 2024
802b375
Update dependencies from https://github.com/dotnet/sdk build 20240422.23
dotnet-maestro[bot] Apr 23, 2024
b8fce88
Update dependencies from https://github.com/dotnet/sdk build 20240422.24
dotnet-maestro[bot] Apr 23, 2024
60e0bcd
Update dependencies from https://github.com/dotnet/sdk build 20240423.1
dotnet-maestro[bot] Apr 23, 2024
16db5e4
Update dependencies from https://github.com/dotnet/sdk build 20240423.3
dotnet-maestro[bot] Apr 23, 2024
aede2ff
Update dependencies from https://github.com/dotnet/sdk build 20240423.4
dotnet-maestro[bot] Apr 23, 2024
0452ce1
Rebootstrap VMR with arcade changes
ellahathaway Apr 23, 2024
c6c8b26
Update dependencies from https://github.com/dotnet/sdk build 20240423.5
dotnet-maestro[bot] Apr 23, 2024
cfcbc28
Merge branch 'main' into darc-main-35a979bc-455b-4e15-b1bf-6da27d06b3a5
akoeplinger Apr 23, 2024
8a72cfc
Remove patches
akoeplinger Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 66 additions & 66 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions eng/Versions.props
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
}
}
49 changes: 0 additions & 49 deletions ...eBuild/patches/aspnetcore/0001-Condition-RIDs-on-which-target-RIDs-are-available-wh.patch
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/SourceBuild/patches/runtime/0001-fix-Alpine-build-break-101302.patch
View file
Open in desktop

This file was deleted.