Skip to content

[release/6.0.3xx] Update dependencies from dotnet/sdk #13123

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

Merged
marcpopMSFT merged 42 commits into from
Feb 18, 2022
Merged

[release/6.0.3xx] Update dependencies from dotnet/sdk #13123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1e96102
Update dependencies from https://github.com/dotnet/sdk build 20220126.9
dotnet-maestro[bot] Jan 26, 2022
464910c
Update dependencies from https://github.com/dotnet/sdk build 20220126.11
dotnet-maestro[bot] Jan 27, 2022
723a8f2
Update dependencies from https://github.com/dotnet/sdk build 20220126.14
dotnet-maestro[bot] Jan 27, 2022
986baf2
Update dependencies from https://github.com/dotnet/sdk build 20220126.21
dotnet-maestro[bot] Jan 27, 2022
bbd3a72
Update dependencies from https://github.com/dotnet/sdk build 20220127.5
dotnet-maestro[bot] Jan 27, 2022
59755fe
Update dependencies from https://github.com/dotnet/sdk build 20220127.8
dotnet-maestro[bot] Jan 27, 2022
7663251
Update dependencies from https://github.com/dotnet/sdk build 20220127.9
dotnet-maestro[bot] Jan 27, 2022
6d6fe7d
Remove source-build patches that were backported
MichaelSimons Jan 28, 2022
69e4975
Update dependencies from https://github.com/dotnet/sdk build 20220127.16
dotnet-maestro[bot] Jan 28, 2022
efeb47f
Update dependencies from https://github.com/dotnet/sdk build 20220128.8
dotnet-maestro[bot] Jan 28, 2022
9478043
Resolve source-build NuGet.client patch conflict
MichaelSimons Feb 1, 2022
bb4604a
Update dependencies from https://github.com/dotnet/sdk build 20220201.3
dotnet-maestro[bot] Feb 1, 2022
8fb2768
Update dependencies from https://github.com/dotnet/sdk build 20220201.15
dotnet-maestro[bot] Feb 2, 2022
9538c72
Update dependencies from https://github.com/dotnet/sdk build 20220202.2
dotnet-maestro[bot] Feb 2, 2022
138ab44
Update dependencies from https://github.com/dotnet/sdk build 20220202.8
dotnet-maestro[bot] Feb 2, 2022
fcd71d7
Update dependencies from https://github.com/dotnet/sdk build 20220202.20
dotnet-maestro[bot] Feb 2, 2022
4877a98
Update dependencies from https://github.com/dotnet/sdk build 20220203.9
dotnet-maestro[bot] Feb 3, 2022
0597782
Update dependencies from https://github.com/dotnet/sdk build 20220203.25
dotnet-maestro[bot] Feb 3, 2022
1001025
Update dependencies from https://github.com/dotnet/sdk build 20220203.30
dotnet-maestro[bot] Feb 4, 2022
2d05a69
Resolve source-build nuget patch conflict
MichaelSimons Feb 4, 2022
85b52bb
Update dependencies from https://github.com/dotnet/sdk build 20220204.5
dotnet-maestro[bot] Feb 4, 2022
893b2df
Update dependencies from https://github.com/dotnet/sdk build 20220204.17
dotnet-maestro[bot] Feb 5, 2022
8edd6f7
Update dependencies from https://github.com/dotnet/sdk build 20220206.5
dotnet-maestro[bot] Feb 7, 2022
6b97f3b
Update dependencies from https://github.com/dotnet/sdk build 20220207.4
dotnet-maestro[bot] Feb 7, 2022
f270ad6
Update dependencies from https://github.com/dotnet/sdk build 20220207.8
dotnet-maestro[bot] Feb 7, 2022
94ce26a
Update dependencies from https://github.com/dotnet/sdk build 20220207.13
dotnet-maestro[bot] Feb 8, 2022
399d10f
Update dependencies from https://github.com/dotnet/sdk build 20220207.19
dotnet-maestro[bot] Feb 8, 2022
b13d3e2
Update dependencies from https://github.com/dotnet/sdk build 20220208.4
dotnet-maestro[bot] Feb 8, 2022
4b87249
Update dependencies from https://github.com/dotnet/sdk build 20220208.11
dotnet-maestro[bot] Feb 9, 2022
e394f37
Update dependencies from https://github.com/dotnet/sdk build 20220209.4
dotnet-maestro[bot] Feb 9, 2022
bcd4831
Update dependencies from https://github.com/dotnet/sdk build 20220209.12
dotnet-maestro[bot] Feb 9, 2022
acdce66
Update dependencies from https://github.com/dotnet/sdk build 20220209.17
dotnet-maestro[bot] Feb 10, 2022
b493a63
Update dependencies from https://github.com/dotnet/sdk build 20220210.1
dotnet-maestro[bot] Feb 10, 2022
0f838f4
Update dependencies from https://github.com/dotnet/sdk build 20220211.2
dotnet-maestro[bot] Feb 11, 2022
5171539
Update dependencies from https://github.com/dotnet/sdk build 20220211.16
dotnet-maestro[bot] Feb 11, 2022
15f196f
Update dependencies from https://github.com/dotnet/sdk build 20220214.3
dotnet-maestro[bot] Feb 14, 2022
574d523
Update dependencies from https://github.com/dotnet/sdk build 20220215.10
dotnet-maestro[bot] Feb 15, 2022
25ef8a1
Update dependencies from https://github.com/dotnet/sdk build 20220216.1
dotnet-maestro[bot] Feb 16, 2022
c1072fb
Update dependencies from https://github.com/dotnet/sdk build 20220216.39
dotnet-maestro[bot] Feb 17, 2022
691bfda
Update dependencies from https://github.com/dotnet/sdk build 20220217.2
dotnet-maestro[bot] Feb 17, 2022
71d2093
Update dependencies from https://github.com/dotnet/sdk build 20220217.12
dotnet-maestro[bot] Feb 17, 2022
8485bd3
Update dependencies from https://github.com/dotnet/sdk build 20220217.14
dotnet-maestro[bot] Feb 17, 2022
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
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,27 @@
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.200-preview.21623.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>55fa299ca45a3c19e8970e6afba34951e368525a</Sha>
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.200-preview.21623.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>55fa299ca45a3c19e8970e6afba34951e368525a</Sha>
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.200-preview.21623.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.300-preview.22117.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>55fa299ca45a3c19e8970e6afba34951e368525a</Sha>
<Sha>ae80bff914f34ef76920e93d87a7805483abae27</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.200-preview.22055.23">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.300-preview.22117.14">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ca80ba4d8c6f3087176440622bbdb90e78d3708</Sha>
<Sha>8083ce50af04881424fb68cdae3afa97fbfdcd19</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.200-preview.22055.23">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.300-preview.22117.14">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>6ca80ba4d8c6f3087176440622bbdb90e78d3708</Sha>
<Sha>8083ce50af04881424fb68cdae3afa97fbfdcd19</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.1-servicing.21567.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand All @@ -121,39 +121,39 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>0350d04790959e8ebdd3ceab0d34a40f811f019d</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.1-beta.21631.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.2-beta.22115.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f</Sha>
<Sha>e20b18e3307d5d4127e46bab55cfe2f0650971a0</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.2-beta.21631.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.3-beta.22115.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>f49aeb20f1b257c3fecf6ddc37f4adefbb669b7f</Sha>
<Sha>e20b18e3307d5d4127e46bab55cfe2f0650971a0</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20211210-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.2.0-release-20220209-04" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>a809880e02d8a9986e3ba1daeeeb5078fbb96be5</Sha>
<Sha>75765f2afc7425f47efde1a59a8eb86cf81658f9</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21519.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.200-1.22069.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>d0662ed8db919642177ddfd06a1c33895a69015f</Sha>
<Sha>70dc7f6daaf50e8eb67afb91876b8efc8330103f</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.1.0-3.22054.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.2.0-1.22114.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>f206c5d203c5562f814d3afa3c9e695250391c76</Sha>
<Sha>e96ba4ed8c46c52194bc5eb59f13f56fded10254</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.1.0-preview-22055-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.2.0-preview-22116-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>797fd829a374a880f63fd4eea4ea6990404c48f4</Sha>
<Sha>def4fbb8675b5b1e3afc6a2613921953a542a9a9</Sha>
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.1.0-preview.1.62" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.2.0-preview.2.58" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>9187a50daec29061772a2057490697c6c0e4c354</Sha>
<Sha>a36df4eafb045b5f189e7219a5261f1f34ba768a</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.200-preview.21623.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.300-preview.22117.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand All @@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.200-preview.22055.23</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.200-preview.22055.23</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.300-preview.22117.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.300-preview.22117.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down Expand Up @@ -113,7 +113,7 @@
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.200-preview.21623.5</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.300-preview.22117.1</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
<!-- 5.0 Template versions -->
<MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates50PackageVersion>
Expand Down Expand Up @@ -150,7 +150,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.2.0-preview-20211210-01</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.2.0-release-20220209-04</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>
Expand Down
68 changes: 0 additions & 68 deletions src/SourceBuild/tarball/patches/format/0001-Fix-MicrosoftExtensionsVersion.patch
View file
Open in desktop

This file was deleted.

Loading