Merge pull request #13494 from dotnet/darc-release/6.0.3xx-a94726bb-356e-4dff-8123-3b2fee1943e8
[release/6.0.3xx] Update dependencies from dotnet/sdk
This commit is contained in:
Michael Simons
GitHub
commit
011137efdc
5 changed files with 20 additions and 114 deletions
|
|
@ -90,27 +90,27 @@
|
|||
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.300-preview.22179.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.300-preview.22180.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>a3441bf58ca476d7415197bcf86349d254abe120</Sha>
|
||||
<Sha>b0eac7f0c4a40316aa4e5004e597e217035cbcc9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22179.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22180.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>a3441bf58ca476d7415197bcf86349d254abe120</Sha>
|
||||
<Sha>b0eac7f0c4a40316aa4e5004e597e217035cbcc9</Sha>
|
||||
<SourceBuild RepoName="templating" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22179.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22180.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/templating</Uri>
|
||||
<Sha>a3441bf58ca476d7415197bcf86349d254abe120</Sha>
|
||||
<Sha>b0eac7f0c4a40316aa4e5004e597e217035cbcc9</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22179.12">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22180.9">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>83fa3101fc591e536182a3d7e11afb2af4451053</Sha>
|
||||
<Sha>eb5e7c9a4e3be4190ae62c0b390e529514e17415</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22179.12">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22180.9">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>83fa3101fc591e536182a3d7e11afb2af4451053</Sha>
|
||||
<Sha>eb5e7c9a4e3be4190ae62c0b390e529514e17415</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="6.0.3-servicing.22123.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -141,19 +141,19 @@
|
|||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-2.22172.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-3.22179.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>f81a859bb414665faafaf9f48b15d76c30df06a0</Sha>
|
||||
<Sha>8525a1e194a1624dd4f3cb58c4e516745fb4cd63</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22178-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22178-04" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>1160f4e0e21969ec6db1529439a9e029ea256b2b</Sha>
|
||||
<Sha>ce7523296d7ddb70fb61a68e84bc2ff38e012e35</Sha>
|
||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.123" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.3.131" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>8bda466765accefccf516850745ad30dceeab381</Sha>
|
||||
<Sha>bc4b41f3ca294ccc8aedc8af5159c215943e1ed2</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/templating -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22179.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22180.3</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/test-templates -->
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftNETSdkPackageVersion>6.0.300-preview.22179.12</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22179.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>6.0.300-preview.22180.9</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22180.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
|
||||
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.300-preview.22179.3</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.300-preview.22180.3</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
|
||||
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
|
||||
<!-- 5.0 Template versions -->
|
||||
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Tue, 23 Nov 2021 16:13:36 +0000
|
||||
Subject: [PATCH] Update System.Threading.Tasks.DataFlow version
|
||||
|
||||
Addresses:
|
||||
NuGet.Build.Tasks.csproj : error NU1605: Detected package downgrade: System.Threading.Tasks.Dataflow from 6.0.0 to 4.9.0. Reference the package directly from the project to select a different version. [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> Microsoft.Build.Tasks.Core 17.1.0-preview-21572-15 -> System.Threading.Tasks.Dataflow (>= 6.0.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
NuGet.Build.Tasks.csproj : error NU1605: NuGet.Build.Tasks -> System.Threading.Tasks.Dataflow (>= 4.9.0) [src/nuget-client.a998efecd431ec8a41536b5ac0152c16f1e2e646/build/restorehelper.targets]
|
||||
|
||||
Backport issue: https://github.com/dotnet/source-build/issues/2311
|
||||
---
|
||||
build/packages.targets | 2 +-
|
||||
1 file changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/build/packages.targets b/build/packages.targets
|
||||
index a0aa4cc..ef5a1cc 100644
|
||||
--- a/build/packages.targets
|
||||
+++ b/build/packages.targets
|
||||
@@ -58,7 +59,7 @@
|
||||
<PackageReference Update="System.Security.Cryptography.Cng" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.Pkcs" Version="$(CryptographyPackagesVersion)" />
|
||||
<PackageReference Update="System.Security.Cryptography.ProtectedData" Version="4.4.0" />
|
||||
- <PackageReference Update="System.Threading.Tasks.Dataflow" Version="4.9.0" />
|
||||
+ <PackageReference Update="System.Threading.Tasks.Dataflow" Version="6.0.0" />
|
||||
<PackageReference Update="VSSDK.TemplateWizardInterface" Version="12.0.4" />
|
||||
<PackageReference Update="VsWebSite.Interop" Version="$(VSFrameworkVersion)" />
|
||||
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 7260c572b1ce424f7ff3a64aa3227417c6a7a676 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <36081148+lbussell@users.noreply.github.com>
|
||||
Date: Fri, 8 Oct 2021 00:56:41 +0000
|
||||
Subject: [PATCH] remove Microsoft.DotNet prebuilts
|
||||
|
||||
Pull request for applying this patch: https://github.com/dotnet/roslyn/pull/57159
|
||||
---
|
||||
eng/Tools.props | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/Tools.props b/eng/Tools.props
|
||||
index 1579b510558..944448855ee 100644
|
||||
--- a/eng/Tools.props
|
||||
+++ b/eng/Tools.props
|
||||
@@ -1,6 +1,6 @@
|
||||
<Project>
|
||||
|
||||
- <ItemGroup>
|
||||
+ <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
|
||||
<!--
|
||||
This package would normally be restored by the Arcade SDK, but it is not included during restore operations
|
||||
if the -package flag is not also provided during the build. Roslyn separates the restore operation from the
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Tue, 19 Oct 2021 19:38:52 -0500
|
||||
Subject: [PATCH] Disable apphost build of 'csi', 'vbi' for source-build
|
||||
|
||||
Creating an apphost for a netcoreapp3.1 project uses the apphost pack as a
|
||||
prebuilt. Stopping these projects from creating the apphost removes the prebuilt
|
||||
for source-build.
|
||||
|
||||
See: https://github.com/dotnet/roslyn/issues/57233
|
||||
|
||||
PR: https://github.com/dotnet/roslyn/pull/57306
|
||||
---
|
||||
src/Interactive/csi/csi.csproj | 1 +
|
||||
src/Interactive/vbi/vbi.vbproj | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj
|
||||
index 3970bb4e9ea..e96beb550d2 100644
|
||||
--- a/src/Interactive/csi/csi.csproj
|
||||
+++ b/src/Interactive/csi/csi.csproj
|
||||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<RootNamespace>CSharpInteractive</RootNamespace>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="Project References">
|
||||
<ProjectReference Include="..\..\Compilers\Core\Portable\Microsoft.CodeAnalysis.csproj" />
|
||||
diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj
|
||||
index 5bbdf7f03a7..5f732d71534 100644
|
||||
--- a/src/Interactive/vbi/vbi.vbproj
|
||||
+++ b/src/Interactive/vbi/vbi.vbproj
|
||||
@@ -6,6 +6,7 @@
|
||||
<OutputType>Exe</OutputType>
|
||||
<StartupObject>Sub Main</StartupObject>
|
||||
<TargetFrameworks>net6.0;net472</TargetFrameworks>
|
||||
+ <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
|
||||
<RootNamespace></RootNamespace>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Label="Project References">
|
||||
Loading…
Reference in a new issue