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 4 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
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
85 changes: 40 additions & 45 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 @@ -331,9 +326,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>ca022cb79bab7a3402802dadec2755e267156793</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
32 changes: 16 additions & 16 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 @@ -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