Skip to content

[main] Update dependencies from dotnet/sdk #19508

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
mmitche merged 22 commits into from
Apr 19, 2024
Merged

[main] Update dependencies from dotnet/sdk #19508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b2cea1f
Update dependencies from https://github.com/dotnet/sdk build 20240417.3
dotnet-maestro[bot] Apr 17, 2024
c57544a
Update dependencies from https://github.com/dotnet/sdk build 20240417.8
dotnet-maestro[bot] Apr 17, 2024
242bb35
Update dependencies from https://github.com/dotnet/sdk build 20240417.12
dotnet-maestro[bot] Apr 17, 2024
da92e14
Update dependencies from https://github.com/dotnet/sdk build 20240417.15
dotnet-maestro[bot] Apr 17, 2024
a1c875c
Update dependencies from https://github.com/dotnet/sdk build 20240417.23
dotnet-maestro[bot] Apr 17, 2024
572f112
Update dependencies from https://github.com/dotnet/sdk build 20240417.26
dotnet-maestro[bot] Apr 17, 2024
287540e
Update dependencies from https://github.com/dotnet/sdk build 20240417.43
dotnet-maestro[bot] Apr 18, 2024
f1e3611
Update dependencies from https://github.com/dotnet/sdk build 20240417.45
dotnet-maestro[bot] Apr 18, 2024
8b0d318
Update dependencies from https://github.com/dotnet/sdk build 20240417.46
dotnet-maestro[bot] Apr 18, 2024
210782b
Update dependencies from https://github.com/dotnet/sdk build 20240417.47
dotnet-maestro[bot] Apr 18, 2024
9a3ef0e
Update dependencies from https://github.com/dotnet/sdk build 20240417.48
dotnet-maestro[bot] Apr 18, 2024
8841d85
Update dependencies from https://github.com/dotnet/sdk build 20240417.49
dotnet-maestro[bot] Apr 18, 2024
c793006
Drop upstreamed patches
akoeplinger Apr 18, 2024
966d7a8
Disable astextplain in git diff
akoeplinger Apr 18, 2024
c4a5a2f
Enable NuGet Client in the VMR build
mmitche Apr 18, 2024
bc3ae27
Update dependencies from https://github.com/dotnet/sdk build 20240418.1
dotnet-maestro[bot] Apr 18, 2024
399aab9
Update dependencies from https://github.com/dotnet/sdk build 20240418.3
dotnet-maestro[bot] Apr 18, 2024
54ae45e
Update dependencies from https://github.com/dotnet/sdk build 20240418.6
dotnet-maestro[bot] Apr 18, 2024
e024202
Update dependencies from https://github.com/dotnet/sdk build 20240418.8
dotnet-maestro[bot] Apr 18, 2024
20e5df9
Update dependencies from https://github.com/dotnet/sdk build 20240418.18
dotnet-maestro[bot] Apr 18, 2024
3d4b480
Merge branch 'enable-nuget-client' into darc-main-a1af0d30-ee95-4225-…
mmitche Apr 19, 2024
e4bb8ae
Merge remote-tracking branch 'upstream/main' into darc-main-a1af0d30-…
mmitche Apr 19, 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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/sdk build 20240417.46 
Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 9.0.100-preview.4.24216.57 -> To Version 9.0.100-preview.4.24217.46

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.9.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.Platforms,Microsoft.SourceBuild.Intermediate.runtime.linux-x64,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.SourceBuild.Intermediate.aspnetcore,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.SourceBuild.Intermediate.roslyn,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk
 From Version 9.0.0-preview.4.24216.16 -> To Version 9.0.0-preview.4.24217.2 (parent: Microsoft.NET.Sdk
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Apr 18, 2024
commit 8b0d318469e88beee144288e20f9dfd5e8f094cd
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,26 +90,26 @@
<Sha>afbcecb4f3a5e7cfa522cdf8446798966606a764</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24217.45">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="9.0.100-preview.4.24217.46">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>04b2231e7b65f48e69b611f5a9d0f26b44be77ab</Sha>
<Sha>6e5ce8e39256e403524db269e1a2a3e52adf35d2</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24217.45">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="9.0.100-preview.4.24217.46">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>04b2231e7b65f48e69b611f5a9d0f26b44be77ab</Sha>
<Sha>6e5ce8e39256e403524db269e1a2a3e52adf35d2</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24217.45">
<Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-preview.4.24217.46">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>04b2231e7b65f48e69b611f5a9d0f26b44be77ab</Sha>
<Sha>6e5ce8e39256e403524db269e1a2a3e52adf35d2</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24217.45">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="9.0.100-preview.4.24217.46">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>04b2231e7b65f48e69b611f5a9d0f26b44be77ab</Sha>
<Sha>6e5ce8e39256e403524db269e1a2a3e52adf35d2</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24217.45">
<Dependency Name="Microsoft.SourceBuild.Intermediate.sdk" Version="9.0.100-preview.4.24217.46">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>04b2231e7b65f48e69b611f5a9d0f26b44be77ab</Sha>
<Sha>6e5ce8e39256e403524db269e1a2a3e52adf35d2</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
Expand Down Expand Up @@ -195,9 +195,9 @@
<Sha>00c956aa2f34df110259acdf722e4122cb802842</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.11.0-preview.1.23" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.11.0-preview.1.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>d01e48ace560689897c1c642591659126736feb8</Sha>
<Sha>bb3993baf36e359d3bc2f1d12243cee07963e161</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-preview.4.24215.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24217.45</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24217.45</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24217.45</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.4.24217.46</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>9.0.100-preview.4.24217.46</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.4.24217.46</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down Expand Up @@ -120,7 +120,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/NuGet/NuGet.Client -->
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.23</NuGetBuildTasksPackageVersion>
<NuGetBuildTasksPackageVersion>6.11.0-preview.1.26</NuGetBuildTasksPackageVersion>
</PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
<PropertyGroup>
Expand Down