10000 [release/2.3] Update Microsoft.Extensions.DependencyModel to 8.0.2 by wtgodbe · Pull Request #61779 · dotnet/aspnetcore · GitHub
[go: up one dir, main page]
Skip to content

[release/2.3] Update Microsoft.Extensions.DependencyModel to 8.0.2 #61779

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

Draft
wants to merge 4 commits into
base: release/2.3
Choose a base branch
from
Draft

[release/2.3] Update Microsoft.Extensions.DependencyModel to 8.0.2 #61779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfd7a3e
Update Microsoft.Extensions.DependencyModel to 8.0.2
wtgodbe May 2, 2025
a3e07c5
Net462
wtgodbe May 2, 2025
a9cc4d1
IFDEF
wtgodbe May 7, 2025
08dc206
Update Microsoft.AspNetCore.Razor.Tools.Test.csproj
wtgodbe May 7, 2025
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
4 changes: 2 additions & 2 deletions build/dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
<DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>2.1.0-prerelease-02430-04</DevDependency_MicrosoftDotNetBuildTasksFeedPackageVersion>
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
<DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</DevDependency_MicrosoftExtensionsDependencyModelPackageVersion>
<DevDependency_AzureStorageBlobsPackageVersion>12.10.0</DevDependency_AzureStorageBlobsPackageVersion>
<FSharpCorePackageVersion>4.2.3</FSharpCorePackageVersion>
<GoogleProtobufPackageVersion>3.15.0</GoogleProtobufPackageVersion>
Expand All @@ -128,7 +128,7 @@
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDotNetArchivePackageVersion>0.2.0-beta-63019-01</MicrosoftDotNetArchivePackageVersion>
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-1-003177</MicrosoftDotNetProjectModelPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>2.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsPlatformAbstractionsPackageVersion>1.1.0</MicrosoftExtensionsPlatformAbstractionsPackageVersion>
<MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.14.2</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.7.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Razor/Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46</TargetFrameworks>
<TargetFrameworks>net462</TargetFrameworks>
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**\*</DefaultItemExcludes>
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
<TestGroupName>RazorTests</TestGroupName>
Expand Down
2 changes: 1 addition & 1 deletion src/Razor/Razor.Tasks/src/DotnetToolTask.cs
10000 View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ protected virtual bool TryExecuteOnServer(
string commandLineCommands,
out int result)
{
#if !NET46
#if !NET46 && !NET462
if (!SuppressCurrentUserOnlyPipeOptions && !Enum.IsDefined(typeof(PipeOptions), PipeOptionCurrentUserOnly))
{
// For security reasons, we don't want to spin up a server that doesn't
Expand Down
6 changes: 3 additions & 3 deletions src/Razor/Razor.Tools/src/Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System;
using System.IO;
using System.IO.Pipes;
#if NET46
#if NET46 || NET462
using System.Security.AccessControl;
using System.Security.Principal;
#endif
Expand Down Expand Up @@ -71,7 +71,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
ServerLogger.Log("Named pipe '{0}' connected", pipeName);
cancellationToken.ThrowIfCancellationRequested();

#if NET46
#if NET46 || NET462
// Verify that we own the pipe.
if (!CheckPipeConnectionOwnership(stream))
{
Expand All @@ -89,7 +89,7 @@ public static async Task<Client> ConnectAsync(string pipeName, TimeSpan? timeout
}
}

#if NET46
#if NET46 || NET462
/// <summary>
/// Check to ensure that the named pipe server we connected to is owned by the same
/// user.
Expand Down
2 changes: 1 addition & 1 deletion src/Razor/Razor.Tools/test/Microsoft.AspNetCore.Razor.Tools.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net462</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Razor/test/testassets/Razor.Test.Common/Language/IntegrationTests/IntegrationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
#if NET46
#if NET46 || NET462
using System.Runtime.Remoting;
using System.Runtime.Remoting.Messaging;
#else
Expand All @@ -24,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests
[IntializeTestFile]
public abstract class IntegrationTestBase
{
#if !NET46
#if !NET46 && !NET462
private static readonly AsyncLocal<string> _fileName = new AsyncLocal<string>();
#endif

Expand All @@ -44,7 +44,7 @@ protected IntegrationTestBase()
// Used by the test framework to set the 'base' name for test files.
public static string FileName
{
#if NET46
#if NET46 || NET462
get
{
var handle = (ObjectHandle)CallContext.LogicalGetData("IntegrationTestBase_FileName");
Expand Down
2 changes: 1 addition & 1 deletion src/Razor/test/testassets/Razor.Test.Common/Microsoft.AspNetCore.Razor.Test.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- To generate baselines, run tests with /p:GenerateBaselines=true -->
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
< 1E0A /td> <DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
<TargetFrameworks>net46</TargetFrameworks>
<TargetFrameworks>net462</TargetFrameworks>
<IsProjectReferenceProvider>true</IsProjectReferenceProvider>
</PropertyGroup>

Expand Down
Loading
0