[release/7.0.2xx] Update dependencies from dotnet/sdk (#15115)
* Update dependencies from https://github.com/dotnet/sdk build 20221209.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22609.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221211.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22611.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20221212.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.22580.54 -> To Version 7.0.200-preview.22612.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.5.0-beta.22580.6 -> To Version 12.5.0-beta.22608.3 (parent: Microsoft.NET.Sdk * Remove backported NuGet source-build patch * Add source-build patch to address NuGet prebuilt * Fix source-build patch Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: MichaelSimons <msimons@microsoft.com>
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
db1f87ec53
commit
5bb11fee92
4 changed files with 57 additions and 71 deletions
|
|
@ -98,22 +98,22 @@
|
|||
<Sha>bb3695688177f5f80eeb3c0498168612e31549d5</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.22580.54">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.200-preview.22612.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
|
||||
<Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22580.54">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.200-preview.22612.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
|
||||
<Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22580.54">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.200-preview.22612.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
|
||||
<Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22580.54">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.200-preview.22612.1">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>2de3de4d26d207246c571ac1e6f5b7d70904204c</Sha>
|
||||
<Sha>f1de6ee836ad96b92317646815bcb66793b98a7b</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="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -124,18 +124,18 @@
|
|||
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
|
||||
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22580.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>53f907e84e36a56e68e76fcc3aa5c12540363345</Sha>
|
||||
<Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22580.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.1-beta.22608.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>53f907e84e36a56e68e76fcc3aa5c12540363345</Sha>
|
||||
<Sha>ae1718567f2aab20df7ca07368b9f51d1c376a10</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221130-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.5.0-preview-20221209-03" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>dbdb1f6f9007a288c904aa1f13485a3e57080fb6</Sha>
|
||||
<Sha>bedc83105652ba5638dfc1ec629f3402af65acd0</Sha>
|
||||
<SourceBuild RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22579.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -144,19 +144,19 @@
|
|||
<SourceBuild RepoName="linker" ManagedOnly="true" />
|
||||
<RepoName>linker</RepoName>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22580.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.5.0-2.22608.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>ea0b6351c129c7decd9bf76f4388239509e28e0d</Sha>
|
||||
<Sha>716366a3830293571eaaad9b1b2b3929b5216f42</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22580-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.5.0-preview-22612-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>ee6f71d15eea77c970815d9105ab9520876c5042</Sha>
|
||||
<Sha>9c3057b5af56ef92ffde7d1b37dea8ddee74d8b1</Sha>
|
||||
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.2.104" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-preview.3.126" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>dfe13cc99d13de74f41e9cff35600a2c8958aac1</Sha>
|
||||
<Sha>31f2a1cb6fe3dababe67cdb84e9d6ddb9e3ace04</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
|
|||
|
|
@ -63,9 +63,9 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22580.54</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.200-preview.22580.54</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22580.54</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.200-preview.22612.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.200-preview.22612.1</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.200-preview.22612.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221130-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.5.0-preview-20221209-03</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Logan Bussell <loganbussell@microsoft.com>
|
||||
Date: Mon, 21 Nov 2022 22:32:04 +0000
|
||||
Subject: [PATCH] Add package version properties for source-build
|
||||
|
||||
Backport: https://github.com/NuGet/Home/issues/12261
|
||||
---
|
||||
Directory.Packages.props | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index 8afa7dd31..0c4eaecf5 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -9,11 +9,13 @@
|
||||
<VSFrameworkVersion>17.2.0-preview-2-32304-091</VSFrameworkVersion>
|
||||
<VSServicesVersion>16.153.0</VSServicesVersion>
|
||||
<!-- Default MSBuild version -->
|
||||
- <MicrosoftBuildVersion>17.3.1</MicrosoftBuildVersion>
|
||||
+ <MicrosoftBuildVersion Condition="'$(MicrosoftBuildVersion)' == ''">17.3.1</MicrosoftBuildVersion>
|
||||
<!-- The last package version of MSBuild that works with netcoreapp3.1 or netstandard2.0 is 16.8.0. Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
|
||||
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp3.1' Or '$(TargetFramework)' == 'netstandard2.0'">16.8.0</MicrosoftBuildVersion>
|
||||
<!-- The last package version of MSBuild that works with net5.0 is 16.11.0. Our assemblies are still compiled against MSBuild assembly version 15.1.0.0 which will work with all versions -->
|
||||
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
|
||||
+ <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
|
||||
+ <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -56,7 +58,7 @@
|
||||
<PackageVersion Include="Microsoft.VisualStudio.VCProjectEngine" Version="$(VSFrameworkVersion)" />
|
||||
<PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.0.7-preview-0001-g5492e466a9" />
|
||||
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.0.1600" />
|
||||
- <PackageVersion Include="Microsoft.Web.Xdt" Version="3.0.0" />
|
||||
+ <PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)"/>
|
||||
<PackageVersion Include="Moq" Version="4.18.1" />
|
||||
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
|
||||
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
|
||||
@@ -66,7 +68,7 @@
|
||||
<PackageVersion Include="SharpZipLib" Version="1.3.3" />
|
||||
<PackageVersion Include="System.Collections" Version="$(SystemPackagesVersion)" />
|
||||
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
||||
- <PackageVersion Include="System.ComponentModel.Composition" Version="4.5.0" />
|
||||
+ <PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionPackageVersion)" />
|
||||
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
|
||||
<PackageVersion Include="System.Diagnostics.Debug" Version="$(SystemPackagesVersion)" />
|
||||
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="$(SystemPackagesVersion)" />
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Mon, 12 Dec 2022 19:30:59 +0000
|
||||
Subject: [PATCH] Define PackageVersion props to address prebuilts
|
||||
|
||||
---
|
||||
Directory.Packages.props | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Directory.Packages.props b/Directory.Packages.props
|
||||
index e4b41a45f..245ffcc99 100644
|
||||
--- a/Directory.Packages.props
|
||||
+++ b/Directory.Packages.props
|
||||
@@ -16,6 +16,8 @@
|
||||
<MicrosoftBuildVersion Condition="'$(TargetFramework)' == 'netcoreapp5.0'">16.11.0</MicrosoftBuildVersion>
|
||||
|
||||
<!-- Overridden by source build to ensure the same version is used across products, do not remove these properties -->
|
||||
+ <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion Condition="'$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
|
||||
+ <MicrosoftExtensionsFileSystemGlobbingPackageVersion Condition="'$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)' == ''">6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
|
||||
<MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
|
||||
<SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
|
||||
</PropertyGroup>
|
||||
@@ -38,8 +40,8 @@
|
||||
<PackageVersion Include="Microsoft.CSharp" Version="$(SystemPackagesVersion)" />
|
||||
<PackageVersion Include="Microsoft.DataAI.NuGetRecommender.Contracts" Version="2.1.0" />
|
||||
<PackageVersion Include="Microsoft.Extensions.CommandLineUtils.Sources" Version="3.0.0-preview6.19253.5" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="6.0.0" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />
|
||||
<PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="$(VSFrameworkVersion)" />
|
||||
<PackageVersion Include="Microsoft.Net.Compilers.netcore" Version="3.0.0-dev-61717-03" />
|
||||
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="3.9.0" />
|
||||
Loading…
Reference in a new issue