Skip to content

[main] Update dependencies from dotnet/arcade #112730

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
jkoritzinsky merged 11 commits into from
Feb 26, 2025
Merged

[main] Update dependencies from dotnet/arcade #112730

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a099c8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 20, 2025
729607f
Address some of the NU1510 and NU1511 warnings
ViktorHofer Feb 20, 2025
cdfaa08
Address more NU1511 warnings
ViktorHofer Feb 21, 2025
9f6369c
Fix build break
ViktorHofer Feb 21, 2025
ea8abbb
workload sdk to >= darc sdk
lewing Feb 21, 2025
9d7ade8
Temporarily remove WasmFingerprintDotnetJs=true test data from blazor…
maraf Feb 22, 2025
f8fe0e8
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 24, 2025
0237230
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 24, 2025
dede398
Bump MicrosoftDotNetApiCompatTaskVersion
akoeplinger Feb 24, 2025
223329c
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Feb 25, 2025
4ffa130
Bump MicrosoftDotNetApiCompatTaskVersion
akoeplinger Feb 26, 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
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,87 +84,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25113.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.25110.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -348,9 +348,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>cf1b2925785f504d4d52773bcab470044e35ea15</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25113.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25119.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
<Sha>11f89f03a41eefcc60e278d0fc96b63b175e4527</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -402,9 +402,9 @@
<Sha>d3972005ce081b597a9dab72761d281e57acdc5a</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.2.25108.4">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="10.0.100-preview.3.25120.7">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c0f88f2416d2e61f302411bdfbab3b2e87b9d35c</Sha>
<Sha>cf870168ce126762c93625219c167f132031e500</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25104.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,24 +83,24 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies (also used in wasm build tests -->
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.2.25108.4</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-preview.3.25120.7</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25113.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25113.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25113.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25113.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25113.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25113.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25113.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25119.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25119.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25119.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25119.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25119.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25119.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25119.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25119.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25119.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25119.2</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =

# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
$defaultXCopyMSBuildVersion = '17.12.0'
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
$defaultXCopyMSBuildVersion = '17.13.0'

if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
Expand Down
10 changes: 5 additions & 5 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.100-alpha.1.25077.2",
"version": "10.0.100-preview.2.25118.3",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "10.0.100-alpha.1.25077.2"
"dotnet": "10.0.100-preview.2.25118.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25113.2",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25119.2",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25119.2",
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25119.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1"
Expand Down
2 changes: 0 additions & 2 deletions ...rosoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,4 @@
BuildInParallel="$(BuildInParallel)" />
</Target>

<Import Project="$(RepositoryEngineeringDir)PackageDownloadAndReference.targets" />

</Project>
9 changes: 0 additions & 9 deletions ...I.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EnableDefaultItems>true</EnableDefaultItems>
<NoWarn>$(NoWarn);CS8002</NoWarn>

<!-- third party DI containers bring in NS1.x dependencies -->
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
</PropertyGroup>

<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand All @@ -23,17 +20,11 @@
<PackageReference Include="LightInject.Microsoft.DependencyInjection" Version="3.7.1" />
<PackageReference Include="Grace.DependencyInjection.Extensions" Version="7.1.0" />
<PackageReference Include="Stashbox.Extensions.Dependencyinjection" Version="4.2.3" />
<!-- Update the transitive STJ to a non-vulnerable version. -->
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>

<!-- These packages don't support .NETFramework -->
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="8.0.1" />
<!-- Lamar depends on System.Runtime.Loader which brings in 1.x packages.
Those have audit warnings when runtime.* packages are brought in for RID-specific restore.
Avoid by referencing the latest Microsoft.NETCore.Targets which will prevent all 1.x runtime.* packages from being referenced. -->
<PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" />
</ItemGroup>

</Project>
2 changes: 0 additions & 2 deletions ....Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
<PropertyGroup>
<RoslynApiVersion>$(MicrosoftCodeAnalysisVersion_3_11)</RoslynApiVersion>
<IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest>
<!-- this Roslyn version brings in NS1.x dependencies -->
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions ...s.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<DefineConstants>$(DefineConstants);ROSLYN4_0_OR_GREATER</DefineConstants>
<IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest>
<EmccLinkOptimizationFlag Condition="'$(ContinuousIntegrationBuild)' == 'true'">-O1</EmccLinkOptimizationFlag>
<!-- this Roslyn version brings in NS1.x dependencies -->
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions ...s.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.8.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
<DefineConstants>$(DefineConstants);ROSLYN4_0_OR_GREATER;ROSLYN4_8_OR_GREATER</DefineConstants>
<IsHighAotMemoryUsageTest>true</IsHighAotMemoryUsageTest>
<EmccLinkOptimizationFlag Condition="'$(ContinuousIntegrationBuild)' == 'true'">-O1</EmccLinkOptimizationFlag>
<!-- this Roslyn version brings in NS1.x dependencies -->
<FlagNetStandard1XDependencies>false</FlagNetStandard1XDependencies>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions ...osoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@
<ItemGroup>
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Abstractions\src\Microsoft.Extensions.Logging.Abstractions.csproj" />
<PackageReference Include="Microsoft.CodeAnalysis" Version="$(RoslynApiVersion)" />
<!-- Ensure we are using live dependencies for CodeAnalysis rather than old packages -->
<PackageReference Include="NETStandard.Library" Version="$(NETStandardLibraryVersion)" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Composition\src\System.Composition.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.IO.Pipelines\src\System.IO.Pipelines.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" />
<PackageReference Include="SQLitePCLRaw.bundle_green" Version="$(SQLitePCLRawbundle_greenVersion)" />
</ItemGroup>

Expand Down
4 changes: 4 additions & 0 deletions ...rosoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
<ItemGroup>
<Compile Include="$(CoreLibSharedDir)System\Runtime\CompilerServices\IsExternalInit.cs" Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" />
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Logging.Console\src\Microsoft.Extensions.Logging.Console.csproj" SkipUseReferenceAssembly="true" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ProjectReference Include="$(LibrariesProjectRoot)System.Diagnostics.DiagnosticSource\src\System.Diagnostics.DiagnosticSource.csproj" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion ...es/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<DefineConstants>$(DefineConstants);XMLSERIALIZERGENERATORTESTS</DefineConstants>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<DefineConstants>$(DefineConstants);XMLSERIALIZERGENERATORTESTS</DefineConstants>
<SkipTestsOnPlatform Condition="'$(TargetsMobile)' == 'true' or '$(TargetOS)' == 'freebsd' or '$(TargetArchitecture)' == 'arm' or '$(TargetArchitecture)' == 'arm64' or '$(TargetArchitecture)' == 'armel' or '$(TargetArchitecture)' == 'wasm'">true</SkipTestsOnPlatform>
</PropertyGroup>

Expand Down
Loading