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

Merge pull request #13550 from dotnet/darc-release/6.0.3xx-68001104-f44f-4e7e-b5fd-5d92efb0930e

Browse source 
[release/6.0.3xx] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2022-04-06 18:00:45 -07:00 committed by GitHub
commit 6d6fe78b65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -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.22201.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.300-preview.22204.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5ad577ee814db3c7473d904888c7db31129cf435</Sha>
<Sha>897d00731c4f89d2adbf174a32fe658ae415fe36</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22201.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22204.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5ad577ee814db3c7473d904888c7db31129cf435</Sha>
<Sha>897d00731c4f89d2adbf174a32fe658ae415fe36</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22201.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22204.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5ad577ee814db3c7473d904888c7db31129cf435</Sha>
<Sha>897d00731c4f89d2adbf174a32fe658ae415fe36</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22204.3">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22205.30">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3c2c2e186f91025bc78ded47b35ddf3b765ee43e</Sha>
<Sha>79124b91b7abd4f5ce51c488ed65cf0fd61848cb</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22204.3">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22205.30">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>3c2c2e186f91025bc78ded47b35ddf3b765ee43e</Sha>
<Sha>79124b91b7abd4f5ce51c488ed65cf0fd61848cb</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">
@ -121,18 +121,18 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>560f243910f407df33fd5cdf06e2a857684f4bc7</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22181.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.3-beta.22203.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>31803ec27047f57c3fd06f3becddf2d369424d62</Sha>
<Sha>8854f5d1f3bd7e60d42565a18a2f8c06ae307474</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.4-beta.22181.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.4-beta.22203.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>31803ec27047f57c3fd06f3becddf2d369424d62</Sha>
<Sha>8854f5d1f3bd7e60d42565a18a2f8c06ae307474</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220209-04" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220404-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>75765f2afc7425f47efde1a59a8eb86cf81658f9</Sha>
<Sha>fd7a89629c321b139d393a224dde2021a98e7888</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22178.2" CoherentParentDependency="Microsoft.NET.Sdk">
@ -141,9 +141,9 @@
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-3.22201.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-3.22205.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>4f4a757510f260eb8ac121dd9f8e7706d13751fb</Sha>
<Sha>0167599e0e1634ea3ed8d0e41390a3c0d9b3e4e9</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22178-04" CoherentParentDependency="Microsoft.NET.Sdk">

10
eng/Versions.props
View file

@ -31,7 +31,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22201.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22204.1</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.22204.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22204.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.300-preview.22205.30</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22205.30</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.22201.5</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.300-preview.22204.1</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
<!-- 5.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
@ -150,7 +150,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.2.0-release-20220209-04</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.2.0-release-20220404-03</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>

41
src/SourceBuild/tarball/patches/vstest/0001-Update-nuspec-project-target-frameworks-for-source-b.patch
View file

@ -1,41 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Tue, 23 Nov 2021 17:45:25 +0000
Subject: [PATCH] Update nuspec project target frameworks for source-build
This patch removes prebuilts caused from targetting netcoreapp1.0
Backported with https://github.com/microsoft/vstest/pull/3188
---
src/package/nuspec/Microsoft.TestPlatform.Build.csproj | 3 ++-
src/package/nuspec/Microsoft.TestPlatform.CLI.csproj | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
index 038fbf8..57cde8e 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
+++ b/src/package/nuspec/Microsoft.TestPlatform.Build.csproj
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp1.0</TargetFramework>
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NuspecFile>TestPlatform.Build.nuspec</NuspecFile>
<NuspecProperties>version=$(Version)</NuspecProperties>
diff --git a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
index 29198ba..19386eb 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
+++ b/src/package/nuspec/Microsoft.TestPlatform.CLI.csproj
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp1.0</TargetFramework>
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' != 'true' ">netcoreapp1.0</TargetFramework>
+ <TargetFramework Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFramework>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<NuspecFile>TestPlatform.CLI.nuspec</NuspecFile>
<NuspecProperties>version=$(Version)</NuspecProperties>