mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/sdk (#16197)

Browse source 
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Larry Ewing <lewing@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2023-04-21 17:59:10 -07:00 committed by GitHub
parent 6233f2fa33
commit 30b74a7bde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -102,22 +102,22 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>45a41b353d078e4d1e5918246fddbacb452eb210</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23221.11">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23221.12">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a18a63d84c5f04f207a431df2a917593d7ec1451</Sha>
<Sha>7fdf9a60d6886def2601640e7baca9c3ee62af00</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23221.11">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23221.12">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a18a63d84c5f04f207a431df2a917593d7ec1451</Sha>
<Sha>7fdf9a60d6886def2601640e7baca9c3ee62af00</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23221.11">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23221.12">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a18a63d84c5f04f207a431df2a917593d7ec1451</Sha>
<Sha>7fdf9a60d6886def2601640e7baca9c3ee62af00</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23221.11">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23221.12">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>a18a63d84c5f04f207a431df2a917593d7ec1451</Sha>
<Sha>7fdf9a60d6886def2601640e7baca9c3ee62af00</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.4.23220.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -156,9 +156,9 @@
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.1.16" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.7.0-preview.1.17" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>7eaba9f3f68b8df63d5dcf10e2a8ef3591164ddf</Sha>
<Sha>28e0a19799b91f03098fc3a9cf5b922b3b0bfa95</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">

6
eng/Versions.props
View file

@ -78,9 +78,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23221.11</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23221.11</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23221.11</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23221.12</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23221.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23221.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>

23
src/SourceBuild/patches/nuget-client/0001-Exclude-netcoreapp5.0-from-MinimalTargetFrameworksEx.patch
View file

@ -1,23 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 13 Apr 2023 18:35:28 +0000
Subject: [PATCH] Exclude netcoreapp5.0 from MinimalTargetFrameworksExeSigning
Backport: https://github.com/dotnet/source-build/issues/3349
---
build/common.project.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/common.project.props b/build/common.project.props
index 185b68bfa..7f285870d 100644
--- a/build/common.project.props
+++ b/build/common.project.props
@@ -24,7 +24,7 @@
<TargetFrameworksExeForSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(TargetFrameworksExe);net7.0</TargetFrameworksExeForSigning>
<MinimalTargetFrameworksExeSigning>$(NETFXTargetFramework);netcoreapp5.0</MinimalTargetFrameworksExeSigning>
<MinimalTargetFrameworksExeSigning Condition=" '$(IsXPlat)' == 'true' ">netcoreapp5.0</MinimalTargetFrameworksExeSigning>
- <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">$(MinimalTargetFrameworksExeSigning);net7.0</MinimalTargetFrameworksExeSigning>
+ <MinimalTargetFrameworksExeSigning Condition="'$(DotNetBuildFromSource)' == 'true'">net7.0</MinimalTargetFrameworksExeSigning>
<TargetFrameworksLibrary>$(NETFXTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
<TargetFrameworksLibrary Condition="'$(DotNetBuildFromSource)' == 'true'">$(NETCoreTargetFramework);$(NetStandardVersion)</TargetFrameworksLibrary>
<TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>