Skip to content
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

[release/8.0.1xx-preview3] Update dependencies from dotnet/sdk #15905

Merged
merged 3 commits into from
Mar 24, 2023
Merged

[release/8.0.1xx-preview3] Update dependencies from dotnet/sdk #15905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53db748
Update dependencies from https://github.com/dotnet/sdk build 20230322.4
dotnet-maestro[bot] Mar 22, 2023
c6ff01b
Update NuGet patch.
crummel Mar 23, 2023
ce2b23a
Another patch fix.
crummel Mar 23, 2023
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
58 changes: 29 additions & 29 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,34 +52,34 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>61ce09105fe08a6b02783970d85712e859479f44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.3.23169.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.3.23170.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>d482bf3f8eea8071fb89fe481a956c9b56ff1c74</Sha>
<Sha>0c6dc91ee5b4d598c00a7589a339711e769cc8e5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand All @@ -102,22 +102,22 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>08bca9607a6d666039a5a5e66c2179f43fe1a1b4</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.3.23170.5">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.3.23172.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1c1c32b62172bbf8cf666783ac575a8ad4f34418</Sha>
<Sha>73ba7cc49aca48b714dfec38874e4e8e2ed707f7</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.3.23170.5">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.3.23172.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1c1c32b62172bbf8cf666783ac575a8ad4f34418</Sha>
<Sha>73ba7cc49aca48b714dfec38874e4e8e2ed707f7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.3.23170.5">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.3.23172.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1c1c32b62172bbf8cf666783ac575a8ad4f34418</Sha>
<Sha>73ba7cc49aca48b714dfec38874e4e8e2ed707f7</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.3.23170.5">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.3.23172.4">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1c1c32b62172bbf8cf666783ac575a8ad4f34418</Sha>
<Sha>73ba7cc49aca48b714dfec38874e4e8e2ed707f7</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.0-preview.3.23166.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand All @@ -128,13 +128,13 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>5d596bd99a06466c7b7aa67f7f66b108abad809a</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23167.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1075dfd55cba81b4da9bf61aa58650ffe9eb8592</Sha>
<Sha>fa42aff3113ee163cde64511ee8d0128cf9ea3aa</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.300-beta.23167.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.300-beta.23171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1075dfd55cba81b4da9bf61aa58650ffe9eb8592</Sha>
<Sha>fa42aff3113ee163cde64511ee8d0128cf9ea3aa</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.0-preview-20230223-05" CoherentParentDependency="Microsoft.NET.Sdk">
Expand All @@ -146,7 +146,7 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>61ce09105fe08a6b02783970d85712e859479f44</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23166.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>48b13597fee9df5ecfbd0b8c0758b3f46bc1d440</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
Expand All @@ -156,9 +156,9 @@
<Sha>60ea2f733cfcc78da965ab43cf040fe5c58800fb</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.3.50" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.3.55" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>b9b418e95ed428961af59f3ee5883f37cf4b0004</Sha>
<Sha>fc41cff354547a3c7f84d88d10d4e0bdf79d9c4b</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,29 +65,29 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.3.23169.3</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.3.23169.3</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.3.23169.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.3.23169.3</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.3.23169.3</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.3.23169.3</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.3.23169.3</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.3.23170.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.3.23170.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.3.23170.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.3.23170.14</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
<dotnetdevcertsPackageVersion>8.0.0-preview.3.23170.14</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>8.0.0-preview.3.23170.14</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>8.0.0-preview.3.23170.14</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.3.23170.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.3.23170.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.3.23170.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.3.23172.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.3.23172.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.3.23172.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23166.9</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23171.5</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
Expand Down
6 changes: 3 additions & 3 deletions src/SourceBuild/patches/nuget-client/0001-Disable-netframework-tfm-trimming.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ diff --git a/build/common.project.props b/build/common.project.props
index c7f8d32e5..f95c35d82 100644
--- a/build/common.project.props
+++ b/build/common.project.props
@@ -23,7 +23,7 @@
<TargetFrameworksExeForSigning Condition=" '$(IsXPlat)' == 'true' ">$(NETCoreTargetFramework);netcoreapp5.0</TargetFrameworksExeForSigning>
<TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
@@ -26,7 +26,7 @@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@crummel where is this coming from? If we are disabling TFM trimming, only the second set of changes is needed, i.e. a single TargetFrameworksLibrary change. My original change is: NuGet/NuGet.Client@2da00ae

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK - this looks good.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no real change to your patch, just the context lines changed which caused it to fail.

<MinimalTargetFrameworksExeSigning Condition=" '$(IsXPlat)' == 'true' ">netcoreapp5.0</MinimalTargetFrameworksExeSigning>
<MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(MinimalTargetFrameworksExeSigning);net7.0</MinimalTargetFrameworksExeSigning>
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
- <TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
+ <TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
Expand Down