mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/sdk (#16311)

Browse source 
[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] 2023-05-03 18:20:31 +00:00 • committed by GitHub
parent a3e05091be
commit 551bf3aa16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/SourceBuild/patches/razor/0001-Fix-Microsoft.Extensions.ObjectPool-package-version.patch
View file

@ -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>