[main] Update dependencies from dotnet/sdk (#14281)
* Update dependencies from https://github.com/dotnet/sdk build 20220809.4 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22404.18 -> To Version 7.0.100-rc.1.22409.4 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk * Remove two backported source-build patches * source-build changes to support templating combining w/sdk * Additional sdk templating patches * Fix patch conflict * Update dependencies from https://github.com/dotnet/sdk build 20220809.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-dev Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22408.8 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.4 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.3 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.5 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Remove backported source-build sdk patches * Revert "source-build changes to support templating combining w/sdk" This reverts commit 7223d6eb777cbeb771812ff5a4d9cf4289aa4833. * Update source-build dependencies * Update dependencies from https://github.com/dotnet/sdk build 20220811.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.7 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.9 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.1 (parent: Microsoft.NET.Sdk * Update dependencies from https://github.com/dotnet/sdk build 20220811.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.100-rc.1.22409.4 -> To Version 7.0.100-rc.1.22411.10 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.0-rc.1.22403.8 -> To Version 7.0.0-rc.1.22410.9 (parent: Microsoft.NET.Sdk * Pull in latest sdk locally via darc 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
e4de5e3bc2
commit
fa0647c82a
5 changed files with 66 additions and 131 deletions
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>d5046afdd2d0e6234ae3fc5bd4ae878594079cc7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
|
||||
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
|
||||
|
|
@ -48,38 +48,38 @@
|
|||
<Uri>https://github.com/dotnet/core-setup</Uri>
|
||||
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22403.8" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-rc.1.22410.9" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>26a71c61fbda229f151afb14e274604b4926df5c</Sha>
|
||||
<Sha>7be37908e5a1cbb83b1062768c1649827eeaceaa</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
<SourceBuildTarball RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22404.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="7.0.0-rc.1.22411.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>80ea57377a90fa2750f46662be3642b59ad0feed</Sha>
|
||||
<Sha>34f5a4fcfaf9a9e1906c432e4d0411fcc78b3177</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
|
||||
<Uri>https://github.com/dotnet/test-templates</Uri>
|
||||
|
|
@ -98,22 +98,22 @@
|
|||
<Sha>0385265f4d0b6413d64aea0223172366a9b9858c</Sha>
|
||||
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22409.4">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100-rc.1.22411.15">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>215b2c8c993c2a5ca47f5e76d52122853a29c4ce</Sha>
|
||||
<Sha>55052f16a491fc83a4ba1bbb1a32873fb1454cd0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22409.4">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rc.1.22411.15">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>215b2c8c993c2a5ca47f5e76d52122853a29c4ce</Sha>
|
||||
<Sha>55052f16a491fc83a4ba1bbb1a32873fb1454cd0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22404.18">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rc.1.22411.15">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6e00e543bbeb8e0491420e2f6b3f7d235166596d</Sha>
|
||||
<Sha>55052f16a491fc83a4ba1bbb1a32873fb1454cd0</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22404.18">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rc.1.22411.15">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>6e00e543bbeb8e0491420e2f6b3f7d235166596d</Sha>
|
||||
<Sha>55052f16a491fc83a4ba1bbb1a32873fb1454cd0</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-rc.1.22377.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -124,18 +124,18 @@
|
|||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>cd58f79f496337e608662e168c80ac8abd0d151b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.6-beta.22403.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.6-beta.22409.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>fa2b1d3ec056f43f64c07c800efa28ab396c2e38</Sha>
|
||||
<Sha>7eb47e9f3dba867dbc9493c5a4297f88ac6b2edb</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.6-beta.22403.4" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.6-beta.22409.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>fa2b1d3ec056f43f64c07c800efa28ab396c2e38</Sha>
|
||||
<Sha>7eb47e9f3dba867dbc9493c5a4297f88ac6b2edb</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220727-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220811-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/microsoft/vstest</Uri>
|
||||
<Sha>63149fdc913835956b51759399e0d0ede3ad0ac3</Sha>
|
||||
<Sha>311e76b0b16936340c18172fff8d3a98d4527f22</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22377.1" 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.4.0-1.22404.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.4.0-1.22409.11" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
<Sha>83ae84b2a99a0bb1cb83525db21d467b99fd0159</Sha>
|
||||
<Sha>8085fcfc48b6031cdcd59a16e9380803af6b1a67</Sha>
|
||||
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22403-01" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.Build" Version="17.4.0-preview-22409-02" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/msbuild</Uri>
|
||||
<Sha>4e58a8330e87412ff43ebe71712394aadfdee208</Sha>
|
||||
<Sha>4ac5d65dea2ca012449480c951dd7762563188ea</Sha>
|
||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-preview.1.34" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="NuGet.Build.Tasks" Version="6.4.0-preview.1.39" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/nuget/nuget.client</Uri>
|
||||
<Sha>421801a875b876882ffe24d87e7ea0862bb1b41f</Sha>
|
||||
<Sha>cf6d15e81f43e96f56b314a3706d8ed9195352f6</Sha>
|
||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||
|
|
|
|||
|
|
@ -49,38 +49,38 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22404.6</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22404.6</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22404.6</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22404.6</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22404.6</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22404.6</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22404.6</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22411.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>7.0.0-rc.1.22411.2</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>7.0.0-rc.1.22411.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22411.2</VSRedistCommonAspNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>7.0.0-rc.1.22411.2</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>7.0.0-rc.1.22411.2</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>7.0.0-rc.1.22411.2</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22409.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22404.18</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22404.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100-rc.1.22411.15</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>7.0.100-rc.1.22411.15</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rc.1.22411.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-rc.1.22410.9</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22403.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-rc.1.22403.8</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22403.8</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rc.1.22410.9</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-rc.1.22410.9</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-rc.1.22410.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-rc.1.22410.9</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22410.9</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-rc.1.22410.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
@ -166,7 +166,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
|
||||
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220727-01</MicrosoftNETTestSdkVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220811-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- dependencies for source-build tarball -->
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@
|
|||
<RepositoryReference Include="roslyn" />
|
||||
<RepositoryReference Include="runtime" />
|
||||
<RepositoryReference Include="sdk" />
|
||||
<RepositoryReference Include="templating" />
|
||||
<RepositoryReference Include="test-templates" />
|
||||
<RepositoryReference Include="vstest" />
|
||||
<RepositoryReference Include="xliff-tasks" />
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Wed, 6 Jul 2022 21:23:02 +0000
|
||||
Subject: [PATCH] Refactor wasmappbuilder's package version references to use
|
||||
versions.props
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/pull/70582
|
||||
---
|
||||
eng/Versions.props | 1 +
|
||||
src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 4 ++--
|
||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 1a8c79e7221..60218bed123 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -104,6 +104,7 @@
|
||||
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
|
||||
<SystemReflectionEmitILGenerationVersion>4.7.0</SystemReflectionEmitILGenerationVersion>
|
||||
<SystemReflectionEmitLightweightVersion>4.7.0</SystemReflectionEmitLightweightVersion>
|
||||
+ <SystemReflectionMetadataLoadContextVersion>4.7.1</SystemReflectionMetadataLoadContextVersion>
|
||||
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
|
||||
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
|
||||
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
|
||||
diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
|
||||
index 7c8465c6bc0..05447ef45ff 100644
|
||||
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
|
||||
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
|
||||
@@ -20,8 +20,8 @@
|
||||
|
||||
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
|
||||
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
|
||||
- <PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.1" />
|
||||
- <PackageReference Include="System.Text.Json" Version="6.0.0" PrivateAssets="all" />
|
||||
+ <PackageReference Include="System.Reflection.MetadataLoadContext" Version="$(SystemReflectionMetadataLoadContextVersion)" />
|
||||
+ <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="GetFilesToPackage" Returns="@(FilesToPackage)">
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: MichaelSimons <msimons@microsoft.com>
|
||||
Date: Fri, 5 Aug 2022 15:26:42 +0000
|
||||
Subject: [PATCH] workaround invalid warning message
|
||||
|
||||
Temporary fix to unblock work until runtime provides a fix.
|
||||
|
||||
Backport: https://github.com/dotnet/runtime/issues/73463
|
||||
---
|
||||
eng/packaging.targets | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/packaging.targets b/eng/packaging.targets
|
||||
index ac639efe49c..1929f2f1251 100644
|
||||
--- a/eng/packaging.targets
|
||||
+++ b/eng/packaging.targets
|
||||
@@ -200,7 +200,7 @@
|
||||
<![CDATA[<Project InitialTargets="$(_NETStandardCompatErrorFileTarget)">
|
||||
<Target Name="$(_NETStandardCompatErrorFileTarget)"
|
||||
Condition="'%24(SuppressTfmSupportBuildWarnings)' == ''">
|
||||
- <Warning Text="$(PackageId) $(PackageVersion) doesn't support %24(TargetFramework) and has not been tested with it. Consider upgrading your TargetFramework to %(NETStandardCompatError.Supported) or later. You may also set <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings> in the project file to ignore this warning and attempt to run in this unsupported configuration at your own risk." />
|
||||
+ <Warning Text="$(PackageId) $(PackageVersion) doesn't support %24(TargetFramework) and has not been tested with it." />
|
||||
</Target>
|
||||
</Project>]]>
|
||||
</_NETStandardCompatErrorFileContent>
|
||||
Loading…
Add table
Reference in a new issue