Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/emsdk #88827

Merged
merged 8 commits into from
Jul 14, 2023
Merged

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/emsdk #88827

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5566501
Update dependencies from https://github.com/dotnet/arcade build 20230…
dotnet-maestro[bot] Jul 13, 2023
9618c4b
Update dependencies from https://github.com/dotnet/emsdk build 202307…
dotnet-maestro[bot] Jul 13, 2023
26e3092
Update Tools.props
ViktorHofer Jul 13, 2023
ea7c09b
Update Version.Details.xml
ViktorHofer Jul 13, 2023
7c3b1d4
Suppress warning in test
elinor-fung Jul 13, 2023
e426ecf
Workaround for https://github.com/dotnet/sdk/issues/34003
elinor-fung Jul 14, 2023
ce6f27d
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jul 14, 2023
2adf3d9
Add reference to NETStandard.Library
elinor-fung Jul 14, 2023
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23360.3",
"version": "8.0.0-prerelease.23363.3",
"commands": [
"xharness"
]
Expand Down
3 changes: 0 additions & 3 deletions eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
<!-- enable source link in pkgproj -->
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkAzureReposGitVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
</ItemGroup>

<!-- excluded from source build -->
Expand Down
97 changes: 46 additions & 51 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
<Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
<SourceBuild RepoName="cecil" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23361.2">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23362.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>afbff08914374ed6790324635b9346d1256680fc</Sha>
<Sha>96c6e0d2c0bb8a90d6b49eb3ffa32593f7df7a18</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23266.3">
Expand All @@ -107,84 +107,79 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23360.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>a1eed1e0522f47f4fbf60ed5f8caef3679208d66</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23326.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23360.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>10a822a79bde97ca45faa76dc4ec33b85533728a</Sha>
<Sha>a171b61473272e5a6d272117963864ba958a012a</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23361.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23360.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -319,21 +314,21 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ab7c4528edb5301cb849f5e114b7f3cc1dea8149</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23360.3">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23363.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23360.3">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23363.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23360.3">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23363.3">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23361.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23362.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23361.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,21 +83,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23361.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23361.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23361.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23361.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23361.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23362.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23362.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23362.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23362.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23362.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23362.5</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -179,9 +179,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.23360.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2</XUnitVersion>
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
Expand Down Expand Up @@ -236,7 +236,7 @@
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
-->
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23361.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23362.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
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": "8.0.100-preview.5.23303.2",
"version": "8.0.100-preview.6.23330.14",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "8.0.100-preview.5.23303.2"
"dotnet": "8.0.100-preview.6.23330.14"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23361.1",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23362.5",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23362.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3"
Expand Down
5 changes: 5 additions & 0 deletions ...ecification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
<PackageDescription>Suite of xUnit.net tests to check for container compatibility with Microsoft.Extensions.DependencyInjection.</PackageDescription>
<!-- this assembly doesn't need to be binplaced -->
<EnableBinPlacing>false</EnableBinPlacing>
<!-- This is warning in net8.0 because xunit.assert pulls in netstandard packages that have non-portable RIDs (OpenSsl).
They won't actually get used at run time - package conflict resolution would normally handle removing them. However,
due to the way the repo builds, the platform manifest for the ref package has not yet been generated when this test
is being built, so they are not removed (and the SDK warns on it). -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we just reference a later NETStandard.Library to avoid those dependencies? The latest NETStandard.Library package won't bring in the old PackageReferences.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please add a PackageRefernce to NetStandard.Library with PrivateAssets="all"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you check 2adf3d9 is what you mean?

</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 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 @@ -6,6 +6,9 @@
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<Nullable>enable</Nullable>
<IgnoreForCI Condition="'$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true' or '$(TargetArchitecture)' == 'ARMv6'">true</IgnoreForCI>
<!-- SQLitePCLRaw currently has non-portable RIDs (alpine). Update to newer version once it released.
https://github.com/ericsink/SQLitePCL.raw/issues/543 -->
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 5 additions & 0 deletions src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@
<Reference Include="System.Diagnostics.StackTrace" Condition="'$(Configuration)' == 'Debug'" />
</ItemGroup>

<!-- Workaround for https://github.com/dotnet/sdk/issues/34003 -->
<ItemGroup>
<_KnownRuntimeIdentiferPlatforms Include="osx;win" />
</ItemGroup>

<!-- Support for deploying msquic on Windows. We make msquic.dll part of runtime binaries: either from official releases or our transport feed. -->
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows' and
'$(TargetOS)' == 'windows' and
Expand Down