Skip to content

[feature/10.0] Update dependencies from dotnet/arcade #8167

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.

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

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
30 changes: 15 additions & 15 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25228.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25230.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f351706234bfbdf026577122a3f2bac65eb74a5b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25228.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25230.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f351706234bfbdf026577122a3f2bac65eb74a5b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25228.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25230.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f351706234bfbdf026577122a3f2bac65eb74a5b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25228.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25230.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f351706234bfbdf026577122a3f2bac65eb74a5b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25228.101">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>5fd0935290d20e7172918595a509a367df7d5bb6</Sha>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25230.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f351706234bfbdf026577122a3f2bac65eb74a5b</Sha>
</Dependency>
<Dependency Name="Microsoft.FileFormats" Version="1.0.622301">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
<!-- dotnet/dotnet references -->
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0-preview.5.25228.101</MicrosoftAspNetCoreAppRuntimewinx64Version>
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25228.101</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25228.101</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25228.101</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25228.101</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25230.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25230.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25230.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.5.25228.101</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemCommandLineVersion>2.0.0-beta5.25228.101</SystemCommandLineVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-preview.5.25228.101</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/jobs/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ parameters:
# This is the default platform provided by Arcade, intended for use by a managed-only repo.
defaultManagedPlatform:
name: 'Managed'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'

# Defines the platforms on which to run build jobs. One job is created for each platform, and the
# object in this array is sent to the job template as 'platform'. If no platforms are specified,
Expand Down
11 changes: 0 additions & 11 deletions eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,3 @@ steps:
continueOnError: true
condition: succeededOrFailed()
sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
- template: /eng/common/core-templates/steps/component-governance.yml
parameters:
displayName: Component Detection (Exclude upstream cache)
is1ESPipeline: ${{ parameters.is1ESPipeline }}
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.101",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25228.101"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25230.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25230.3"
}
}
58 changes: 0 additions & 58 deletions src/arcade/eng/common/core-templates/jobs/source-build.yml

This file was deleted.

11 changes: 0 additions & 11 deletions src/arcade/eng/common/core-templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,3 @@ steps:
continueOnError: true
condition: succeededOrFailed()
sbomEnabled: false # we don't need SBOM for logs

# Manually inject component detection so that we can ignore the source build upstream cache, which contains
# a nupkg cache of input packages (a local feed).
# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir'
# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets
- template: /eng/common/core-templates/steps/component-governance.yml
parameters:
displayName: Component Detection (Exclude upstream cache)
is1ESPipeline: ${{ parameters.is1ESPipeline }}
componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache'
disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }}