Skip to content

[main] Update dependencies from dotnet/sdk #16033

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
MichaelSimons merged 44 commits into from
Apr 20, 2023
Merged

[main] Update dependencies from dotnet/sdk #16033

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
a9ed0bf
Update dependencies from https://github.com/dotnet/sdk build 20230417.31
dotnet-maestro[bot] Apr 18, 2023
c17c639
Update dependencies from https://github.com/dotnet/sdk build 20230417.36
dotnet-maestro[bot] Apr 18, 2023
e815f19
Update dependencies from https://github.com/dotnet/sdk build 20230417.38
dotnet-maestro[bot] Apr 18, 2023
1d64461
Update dependencies from https://github.com/dotnet/sdk build 20230418.1
dotnet-maestro[bot] Apr 18, 2023
9b5bca2
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
marek-safar Apr 18, 2023
731f83d
Update dependencies from https://github.com/dotnet/sdk build 20230418.2
dotnet-maestro[bot] Apr 18, 2023
7e66707
Update dependencies from https://github.com/dotnet/sdk build 20230418.3
dotnet-maestro[bot] Apr 18, 2023
56f4206
Resolve conflict in source-build sdk patch
MichaelSimons Apr 18, 2023
7d513a0
Disable source-build integration tests that need additional investiga…
MichaelSimons Apr 18, 2023
eada082
Update dependencies from https://github.com/dotnet/sdk build 20230418.10
dotnet-maestro[bot] Apr 18, 2023
bc0bfe1
Update dependencies from https://github.com/dotnet/sdk build 20230418.15
dotnet-maestro[bot] Apr 18, 2023
4825599
Update dependencies from https://github.com/dotnet/sdk build 20230418.19
dotnet-maestro[bot] Apr 18, 2023
c54ca03
Update dependencies from https://github.com/dotnet/sdk build 20230418.21
dotnet-maestro[bot] Apr 18, 2023
26a0234
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
MichaelSimons Apr 18, 2023
ec1c83f
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
danmoseley Apr 18, 2023
80558b4
Update dependencies from https://github.com/dotnet/sdk build 20230418.24
dotnet-maestro[bot] Apr 18, 2023
3bcee58
Update dependencies from https://github.com/dotnet/sdk build 20230418.27
dotnet-maestro[bot] Apr 18, 2023
ec86d63
Update dependencies from https://github.com/dotnet/sdk build 20230418.29
dotnet-maestro[bot] Apr 19, 2023
687060e
Update dependencies from https://github.com/dotnet/sdk build 20230418.30
dotnet-maestro[bot] Apr 19, 2023
5067df2
Update dependencies from https://github.com/dotnet/sdk build 20230418.31
dotnet-maestro[bot] Apr 19, 2023
4f40292
Update dependencies from https://github.com/dotnet/sdk build 20230418.32
dotnet-maestro[bot] Apr 19, 2023
60e07c3
Update dependencies from https://github.com/dotnet/sdk build 20230418.34
dotnet-maestro[bot] Apr 19, 2023
725b1b3
Update dependencies from https://github.com/dotnet/sdk build 20230419.1
dotnet-maestro[bot] Apr 19, 2023
b74ebcf
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
marek-safar Apr 19, 2023
b0d2ed0
Update dependencies from https://github.com/dotnet/sdk build 20230419.2
dotnet-maestro[bot] Apr 19, 2023
bc44a32
Update dependencies from https://github.com/dotnet/sdk build 20230419.4
dotnet-maestro[bot] Apr 19, 2023
05b7660
Update dependencies from https://github.com/dotnet/sdk build 20230419.6
dotnet-maestro[bot] Apr 19, 2023
300c190
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
marek-safar Apr 19, 2023
f3c9803
Update dependencies from https://github.com/dotnet/sdk build 20230419.8
dotnet-maestro[bot] Apr 19, 2023
000cda4
Update dependencies from https://github.com/dotnet/sdk build 20230419.9
dotnet-maestro[bot] Apr 19, 2023
d7ae3a9
Update dependencies from https://github.com/dotnet/sdk build 20230419.10
dotnet-maestro[bot] Apr 19, 2023
52e1d41
Add source-build roslyn-analyzer patch to unblock build
MichaelSimons Apr 19, 2023
408e275
Merge branch 'darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d' of http…
MichaelSimons Apr 19, 2023
eef9e2c
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
MichaelSimons Apr 19, 2023
a97bbf9
Update dependencies from https://github.com/dotnet/sdk build 20230419.11
dotnet-maestro[bot] Apr 19, 2023
e4aae78
Update dependencies from https://github.com/dotnet/sdk build 20230419.12
dotnet-maestro[bot] Apr 19, 2023
9aa3051
Update dependencies from https://github.com/dotnet/sdk build 20230419.14
dotnet-maestro[bot] Apr 20, 2023
270ba9b
Update dependencies from https://github.com/dotnet/sdk build 20230419.15
dotnet-maestro[bot] Apr 20, 2023
45300fb
Update dependencies from https://github.com/dotnet/sdk build 20230419.17
dotnet-maestro[bot] Apr 20, 2023
835bedb
Update dependencies from https://github.com/dotnet/sdk build 20230420.1
dotnet-maestro[bot] Apr 20, 2023
80bf618
Update dependencies from https://github.com/dotnet/sdk build 20230420.2
dotnet-maestro[bot] Apr 20, 2023
82a3480
Update dependencies from https://github.com/dotnet/sdk build 20230420.3
dotnet-maestro[bot] Apr 20, 2023
bdc296b
Merge branch 'main' into darc-main-d1692cc6-e594-4aaf-9242-8c8113d82c8d
marek-safar Apr 20, 2023
0ba5644
Disable fotmat repo from build to unblock
MichaelSimons Apr 20, 2023
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
Prev Previous commit
Next Next commit
Update dependencies from https://github.com/dotnet/sdk build 20230419.17 
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.4.23217.22 -> To Version 8.0.100-preview.4.23219.17

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-preview.4.23178.3 -> To Version 8.0.0-preview.4.23218.3 (parent: Microsoft.NET.Sdk
  • Loading branch information
@dotnet-maestro
dotnet-maestro[bot] committed Apr 20, 2023
commit 45300fb0489b0f2ef489b44554b3b1eba4765678
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.23219.15">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.4.23219.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5dfa7485debfe1026d3cf4fbfa8cfeefd44ae0c2</Sha>
<Sha>8a117f6c0ae863977f30c3eb41eacaebc1024ccd</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23219.15">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.4.23219.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5dfa7485debfe1026d3cf4fbfa8cfeefd44ae0c2</Sha>
<Sha>8a117f6c0ae863977f30c3eb41eacaebc1024ccd</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23219.15">
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.4.23219.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5dfa7485debfe1026d3cf4fbfa8cfeefd44ae0c2</Sha>
<Sha>8a117f6c0ae863977f30c3eb41eacaebc1024ccd</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23219.15">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.4.23219.17">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5dfa7485debfe1026d3cf4fbfa8cfeefd44ae0c2</Sha>
<Sha>8a117f6c0ae863977f30c3eb41eacaebc1024ccd</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.23213.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down Expand Up @@ -146,9 +146,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3a01050b47f414a3a67d1184962bb83b1c0d7d56</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23219.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-1.23219.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>8df595bb0a16be0a7075080ccc10abfe587ec6b8</Sha>
<Sha>a6a78dd64fc1eb466113ece272747a72d497aad7</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23217-02" CoherentParentDependency="Microsoft.NET.Sdk">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,16 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23219.15</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23219.15</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23219.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.4.23219.17</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>8.0.100-preview.4.23219.17</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.4.23219.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23219.7</MicrosoftNetCompilersToolsetPackageVersion>
<MicrosoftNetCompilersToolsetPackageVersion>4.7.0-1.23219.11</MicrosoftNetCompilersToolsetPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
Expand Down