Skip to content

Commit b40d643

Browse files
dotnet-maestro[bot]ViktorHoferelinor-fung
authored
[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/emsdk (#88827)
* Update dependencies from https://github.com/dotnet/arcade build 20230712.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23361.1 -> To Version 8.0.0-beta.23362.5 Dependency coherency updates Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks From Version 8.0.0-beta.23360.2 -> To Version 8.0.0-beta.23361.2 (parent: Microsoft.DotNet.Arcade.Sdk * Update dependencies from https://github.com/dotnet/emsdk build 20230712.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-preview.7.23361.2 -> To Version 8.0.0-preview.7.23362.1 * Update Tools.props * Update Version.Details.xml * Suppress warning in test * Workaround for dotnet/sdk#34003 * Update dependencies from https://github.com/dotnet/xharness build 20230713.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23360.3 -> To Version 8.0.0-prerelease.23363.3 * Add reference to NETStandard.Library --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Elinor Fung <[email protected]>
1 parent 9915e98 commit b40d643

File tree

8 files changed

+85
-79
lines changed

8 files changed

+85
-79
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "8.0.0-prerelease.23360.3",
18+
"version": "8.0.0-prerelease.23363.3",
1919
"commands": [
2020
"xharness"
2121
]

‎eng/Tools.props‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

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

1512
<!-- excluded from source build -->

‎eng/Version.Details.xml‎

Lines changed: 46 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
<Sha>1a6a83a8f50e1119f1007b1e3c211d3289ba6901</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23361.2">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-preview.7.23362.1">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>afbff08914374ed6790324635b9346d1256680fc</Sha>
95+
<Sha>96c6e0d2c0bb8a90d6b49eb3ffa32593f7df7a18</Sha>
9696
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
9797
</Dependency>
9898
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23266.3">
@@ -107,84 +107,79 @@
107107
</Dependency>
108108
</ProductDependencies>
109109
<ToolsetDependencies>
110-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23361.1">
110+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23362.5">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
112+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
113113
<SourceBuild RepoName="arcade" ManagedOnly="true" />
114114
</Dependency>
115-
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23360.2" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
116-
<Uri>https://github.com/dotnet/sourcelink</Uri>
117-
<Sha>a1eed1e0522f47f4fbf60ed5f8caef3679208d66</Sha>
118-
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
119-
</Dependency>
120-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23326.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
115+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23360.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
121116
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
122-
<Sha>10a822a79bde97ca45faa76dc4ec33b85533728a</Sha>
117+
<Sha>a171b61473272e5a6d272117963864ba958a012a</Sha>
123118
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
124119
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23361.1">
120+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23362.5">
126121
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
122+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
128123
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23361.1">
124+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.23362.5">
130125
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
126+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
132127
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23361.1">
128+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23362.5">
134129
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
130+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
136131
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23361.1">
132+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23362.5">
138133
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
134+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
140135
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23361.1">
136+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23362.5">
142137
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
138+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
144139
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23361.1">
140+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.23362.5">
146141
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
142+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
148143
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23361.1">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.23362.5">
150145
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
146+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
152147
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23361.1">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23362.5">
154149
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
150+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
156151
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23361.1">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.23362.5">
158153
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
154+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
160155
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23361.1">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.23362.5">
162157
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
158+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
164159
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23361.1">
160+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.23362.5">
166161
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
162+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
168163
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23361.1">
164+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.23362.5">
170165
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
166+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
172167
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23361.1">
168+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23362.5">
174169
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
170+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
176171
</Dependency>
177-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23361.1">
172+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23362.5">
178173
<Uri>https://github.com/dotnet/arcade</Uri>
179-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
174+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
180175
</Dependency>
181-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23361.1">
176+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.23362.5">
182177
<Uri>https://github.com/dotnet/arcade</Uri>
183-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
178+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
184179
</Dependency>
185-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23361.1">
180+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.23362.5">
186181
<Uri>https://github.com/dotnet/arcade</Uri>
187-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
182+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
188183
</Dependency>
189184
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23360.1">
190185
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -319,21 +314,21 @@
319314
<Uri>https://github.com/dotnet/runtime</Uri>
320315
<Sha>ab7c4528edb5301cb849f5e114b7f3cc1dea8149</Sha>
321316
</Dependency>
322-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23360.3">
317+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23363.3">
323318
<Uri>https://github.com/dotnet/xharness</Uri>
324-
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
319+
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
325320
</Dependency>
326-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23360.3">
321+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23363.3">
327322
<Uri>https://github.com/dotnet/xharness</Uri>
328-
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
323+
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
329324
</Dependency>
330-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23360.3">
325+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23363.3">
331326
<Uri>https://github.com/dotnet/xharness</Uri>
332-
<Sha>ca022cb79bab7a3402802dadec2755e267156793</Sha>
327+
<Sha>b0548ed270ed98fa14ab0fcc5ef7af99fad00237</Sha>
333328
</Dependency>
334-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23361.1">
329+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.23362.5">
335330
<Uri>https://github.com/dotnet/arcade</Uri>
336-
<Sha>2d2482f9b6ccaaac02ef39adc06b3e30b29a5c13</Sha>
331+
<Sha>7f922d5c3edb921ed36d169263c55065e235b333</Sha>
337332
</Dependency>
338333
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23361.5">
339334
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,21 @@
8383
<!-- SDK dependencies -->
8484
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-preview.7.23329.3</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23361.1</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23361.1</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23361.1</MicrosoftDotNetXUnitExtensionsVersion>
91-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23361.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
92-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksArchivesVersion>
93-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksInstallersVersion>
94-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksPackagingVersion>
95-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksTemplatingVersion>
97-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23361.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23361.1</MicrosoftDotNetRemoteExecutorVersion>
99-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23361.1</MicrosoftDotNetVersionToolsTasksVersion>
100-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23361.1</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.23362.5</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.23362.5</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.23362.5</MicrosoftDotNetXUnitExtensionsVersion>
91+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23362.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
92+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksArchivesVersion>
93+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksInstallersVersion>
94+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksPackagingVersion>
95+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
96+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksTemplatingVersion>
97+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.23362.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
98+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23362.5</MicrosoftDotNetRemoteExecutorVersion>
99+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.23362.5</MicrosoftDotNetVersionToolsTasksVersion>
100+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.23362.5</MicrosoftDotNetPackageTestingVersion>
101101
<!-- NuGet dependencies -->
102102
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
103103
<!-- Installer dependencies -->
@@ -179,9 +179,9 @@
179179
<!-- Testing -->
180180
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
181181
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
182-
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
183-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
184-
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23360.3</MicrosoftDotNetXHarnessCLIVersion>
182+
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
183+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
184+
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23363.3</MicrosoftDotNetXHarnessCLIVersion>
185185
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.23360.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
186186
<XUnitVersion>2.4.2</XUnitVersion>
187187
<XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
@@ -236,7 +236,7 @@
236236
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
237237
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
238238
-->
239-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23361.2</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
239+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>8.0.0-preview.7.23362.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion>
240240
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportVersion)</MicrosoftNETRuntimeEmscriptenVersion>
241241
<!-- workloads -->
242242
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

‎global.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "8.0.100-preview.5.23303.2",
3+
"version": "8.0.100-preview.6.23330.14",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.100-preview.5.23303.2"
8+
"dotnet": "8.0.100-preview.6.23330.14"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23361.1",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23361.1",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23361.1",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23362.5",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23362.5",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23362.5",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-preview.7.23359.3"

‎src/libraries/Microsoft.Extensions.DependencyInjection.Specification.Tests/src/Microsoft.Extensions.DependencyInjection.Specification.Tests.csproj‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.DependencyInjection.Abstractions\src\Microsoft.Extensions.DependencyInjection.Abstractions.csproj" />
2222
<PackageReference Include="xunit.assert" Version="$(XUnitVersion)" />
2323
<PackageReference Include="xunit.extensibility.core" Version="$(XUnitVersion)" />
24+
25+
<!-- Upgrade the NETStandard.Library transitive xunit dependency to avoid transitive 1.x NS dependencies. -->
26+
<PackageReference Include="NETStandard.Library"
27+
Version="$(NetStandardLibraryVersion)"
28+
PrivateAssets="all"
29+
Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
2430
</ItemGroup>
2531

2632
</Project>

‎src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
77
<Nullable>enable</Nullable>
88
<IgnoreForCI Condition="'$(TargetsMobile)' == 'true' or '$(TargetsLinuxBionic)' == 'true' or '$(TargetArchitecture)' == 'ARMv6'">true</IgnoreForCI>
9+
<!-- SQLitePCLRaw currently has non-portable RIDs (alpine). Update to newer version once it released.
10+
https://github.com/ericsink/SQLitePCL.raw/issues/543 -->
11+
<NoWarn>$(NoWarn);NETSDK1206</NoWarn>
912
</PropertyGroup>
1013

1114
<ItemGroup>

‎src/libraries/System.Net.Quic/src/System.Net.Quic.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@
130130
<Reference Include="System.Diagnostics.StackTrace" Condition="'$(Configuration)' == 'Debug'" />
131131
</ItemGroup>
132132

133+
<!-- Workaround for https://github.com/dotnet/sdk/issues/34003 -->
134+
<ItemGroup>
135+
<_KnownRuntimeIdentiferPlatforms Include="osx;win" />
136+
</ItemGroup>
137+
133138
<!-- Support for deploying msquic on Windows. We make msquic.dll part of runtime binaries: either from official releases or our transport feed. -->
134139
<ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows' and
135140
'$(TargetOS)' == 'windows' and

0 commit comments

Comments
 (0)