[main] Update dependencies from dotnet/sdk (#16311)
[main] Update dependencies from dotnet/sdk - Coherency Updates: - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-preview.5.23252.16 to 8.0.0-preview.5.23252.26 (parent: Microsoft.NET.Sdk) - Microsoft.FSharp.Compiler: from 12.5.0-beta.23251.2 to 12.5.0-beta.23253.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.400-beta.23251.2 to 7.0.400-beta.23253.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.5.23252.2 to 8.0.0-preview.5.23252.13 (parent: Microsoft.NET.Sdk) - Merge branch 'main' into darc-main-4610d0ed-e56b-409d-a9c4-39a6c43910f9 - Merge branch 'main' into darc-main-4610d0ed-e56b-409d-a9c4-39a6c43910f9 - Remove backported razor patch - Merge branch 'main' into darc-main-4610d0ed-e56b-409d-a9c4-39a6c43910f9
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
a3e05091be
commit
551bf3aa16
3 changed files with 59 additions and 122 deletions
|
|
@ -17,30 +17,30 @@
|
|||
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
|
||||
<Sha>71e223a38bfa0a76bd1b69ab264ab3083e10eed8</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</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="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.5.23252.16" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.5.23252.26" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/aspnetcore</Uri>
|
||||
<Sha>42d14c4bab2afb8cddc1f9683aa8ff2e20a46edb</Sha>
|
||||
<Sha>730dac21a5991eb8f130717c12de22f46715b8c7</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>
|
||||
|
|
@ -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.5.23252.38">
|
||||
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.100-preview.5.23253.7">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cedf095f532bfce7dc39ed10a1bf757e9b105595</Sha>
|
||||
<Sha>831612e6da70206767fbc314c3a0263482ba4e68</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.5.23252.38">
|
||||
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.100-preview.5.23253.7">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cedf095f532bfce7dc39ed10a1bf757e9b105595</Sha>
|
||||
<Sha>831612e6da70206767fbc314c3a0263482ba4e68</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.5.23252.38">
|
||||
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.100-preview.5.23253.7">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cedf095f532bfce7dc39ed10a1bf757e9b105595</Sha>
|
||||
<Sha>831612e6da70206767fbc314c3a0263482ba4e68</Sha>
|
||||
<SourceBuild RepoName="sdk" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.5.23252.38">
|
||||
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.100-preview.5.23253.7">
|
||||
<Uri>https://github.com/dotnet/sdk</Uri>
|
||||
<Sha>cedf095f532bfce7dc39ed10a1bf757e9b105595</Sha>
|
||||
<Sha>831612e6da70206767fbc314c3a0263482ba4e68</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.5.23251.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
|
||||
|
|
@ -128,13 +128,13 @@
|
|||
<Uri>https://github.com/dotnet/wpf</Uri>
|
||||
<Sha>7228d1cadcdd6591c7869797df480b3d07f86277</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23251.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23253.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>8c91d38f38ece75cac4feb009a11fb42d17fc790</Sha>
|
||||
<Sha>4aa2bf326fc98f39f6516c9b3be6ae73f2a50166</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23251.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.400-beta.23253.1" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/fsharp</Uri>
|
||||
<Sha>8c91d38f38ece75cac4feb009a11fb42d17fc790</Sha>
|
||||
<Sha>4aa2bf326fc98f39f6516c9b3be6ae73f2a50166</Sha>
|
||||
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.7.0-preview.23226.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
|
|
@ -142,9 +142,9 @@
|
|||
<Sha>9ded6180d38d3092df375a5a2cca83cc156f14ff</Sha>
|
||||
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23252.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.5.23252.13" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
<Sha>18e3bbf628eba8dd9e27a0e1da3ff168192e60c7</Sha>
|
||||
<Sha>bc9dad2351827fdbbde7b10ff97f253a065d49e5</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.7.0-2.23251.6" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||
<Uri>https://github.com/dotnet/roslyn</Uri>
|
||||
|
|
|
|||
|
|
@ -65,22 +65,22 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23252.16</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.5.23252.16</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.5.23252.16</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23252.16</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.5.23252.16</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.5.23252.16</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.5.23252.16</dotnetusersecretsPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23252.26</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-preview.5.23252.26</MicrosoftAspNetCoreAppRefPackageVersion>
|
||||
<MicrosoftAspNetCoreAppRefInternalPackageVersion>8.0.0-preview.5.23252.26</MicrosoftAspNetCoreAppRefInternalPackageVersion>
|
||||
<VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23252.26</VSRedistCommonAspNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<dotnetdevcertsPackageVersion>8.0.0-preview.5.23252.26</dotnetdevcertsPackageVersion>
|
||||
<dotnetuserjwtsPackageVersion>8.0.0-preview.5.23252.26</dotnetuserjwtsPackageVersion>
|
||||
<dotnetusersecretsPackageVersion>8.0.0-preview.5.23252.26</dotnetusersecretsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/sdk -->
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.5.23252.38</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.5.23252.38</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.5.23252.38</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftDotNetCommonItemTemplatesPackageVersion>8.0.100-preview.5.23253.7</MicrosoftDotNetCommonItemTemplatesPackageVersion>
|
||||
<MicrosoftNETSdkPackageVersion>8.0.100-preview.5.23253.7</MicrosoftNETSdkPackageVersion>
|
||||
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>8.0.100-preview.5.23253.7</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
|
||||
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
|
||||
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
|
||||
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
|
||||
|
|
@ -91,16 +91,16 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/corefx -->
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.5.23252.2</MicrosoftNETCorePlatformsPackageVersion>
|
||||
<MicrosoftNETCorePlatformsPackageVersion>8.0.0-preview.5.23252.13</MicrosoftNETCorePlatformsPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependencies from https://github.com/dotnet/core-setup -->
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23252.2</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.5.23252.2</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23252.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.5.23252.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23252.2</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.5.23252.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.5.23252.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
|
||||
<VSRedistCommonNetCoreTargetingPackx6480PackageVersion>8.0.0-preview.5.23252.13</VSRedistCommonNetCoreTargetingPackx6480PackageVersion>
|
||||
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.5.23252.13</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppHostwinx64PackageVersion>8.0.0-preview.5.23252.13</MicrosoftNETCoreAppHostwinx64PackageVersion>
|
||||
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.5.23252.13</MicrosoftNETCoreAppRefPackageVersion>
|
||||
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.5.23252.13</MicrosoftNETCoreDotNetHostResolverPackageVersion>
|
||||
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Nikola Milosavljevic <nikolam@microsoft.com>
|
||||
Date: Fri, 28 Apr 2023 07:06:18 +0000
|
||||
Subject: [PATCH] Fix Microsoft.Extensions.ObjectPool package version
|
||||
|
||||
---
|
||||
eng/Versions.props | 2 ++
|
||||
src/Compiler/Directory.Packages.props | 2 +-
|
||||
...osoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj | 2 +-
|
||||
.../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +-
|
||||
4 files changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 559125601..6c101b515 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -94,6 +94,8 @@
|
||||
<MicrosoftVisualStudioShellPackagesVersion>17.5.0-preview-2-33117-317</MicrosoftVisualStudioShellPackagesVersion>
|
||||
<MicrosoftVisualStudioPackagesVersion>17.5.274-preview</MicrosoftVisualStudioPackagesVersion>
|
||||
<VisualStudioLanguageServerProtocolVersion>17.6.4-preview</VisualStudioLanguageServerProtocolVersion>
|
||||
+ <!-- dotnet/aspnetcore packages -->
|
||||
+ <MicrosoftExtensionsObjectPoolPackageVersion>6.0.0</MicrosoftExtensionsObjectPoolPackageVersion>
|
||||
<!-- dotnet/runtime packages -->
|
||||
<MicrosoftExtensionsPackageVersion>6.0.0</MicrosoftExtensionsPackageVersion>
|
||||
<SystemCollectionsImmutablePackageVersion>6.0.0</SystemCollectionsImmutablePackageVersion>
|
||||
diff --git a/src/Compiler/Directory.Packages.props b/src/Compiler/Directory.Packages.props
|
||||
index 118ed5d41..245b9bd4f 100644
|
||||
--- a/src/Compiler/Directory.Packages.props
|
||||
+++ b/src/Compiler/Directory.Packages.props
|
||||
@@ -30,6 +30,6 @@
|
||||
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(Tooling_MicrosoftCodeAnalysisBannedApiAnalyzersPackageVersion)" />
|
||||
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(Tooling_RoslynDiagnosticsAnalyzersPackageVersion)" />
|
||||
<PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
|
||||
- <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
|
||||
+ <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj
|
||||
index 7a90709c3..278d12786 100644
|
||||
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj
|
||||
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace/Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace.csproj
|
||||
@@ -11,7 +11,7 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)" />
|
||||
- <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
|
||||
+ <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsPackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj
|
||||
index 7b7fbdd73..e591d60de 100644
|
||||
--- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj
|
||||
+++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj
|
||||
@@ -11,7 +11,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
- <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsPackageVersion)" />
|
||||
+ <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
|
||||
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
Loading…
Reference in a new issue