Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20220…
Browse files Browse the repository at this point in the history
…930.2

Microsoft.DotNet.ApiCompat , 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.22469.1 -> To Version 8.0.0-beta.22480.2
  • Loading branch information
dotnet-maestro[bot] committed Oct 1, 2022
1 parent 6299fc8 commit 1c2a84d
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 57 deletions.
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,77 +86,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22479.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22476.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -274,9 +274,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>a8e8fc0ffeb9b8c56ab799597597ce35d5be6111</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22479.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22480.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>53c19829c61fa652687e90075ec391f7610d506f</Sha>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22462.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22479.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22479.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22479.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22479.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22479.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22479.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22479.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22479.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22479.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22479.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22480.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22480.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22480.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22480.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22480.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22480.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22480.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
4 changes: 4 additions & 0 deletions eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ parameters:
enablePublishTestResults: false
enablePublishUsingPipelines: false
disableComponentGovernance: false
componentGovernanceIgnoreDirectories: ''
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
Expand Down Expand Up @@ -146,6 +147,8 @@ jobs:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- task: ComponentGovernanceComponentDetection@0
continueOnError: true
inputs:
ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
Expand Down Expand Up @@ -223,4 +226,5 @@ jobs:
parameters:
PackageVersion: ${{ parameters.packageVersion}}
BuildDropPath: ${{ parameters.buildDropPath }}
IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }}

4 changes: 4 additions & 0 deletions eng/common/templates/steps/generate-sbom.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# PackageName - The name of the package this SBOM represents.
# PackageVersion - The version of the package this SBOM represents.
# ManifestDirPath - The path of the directory where the generated manifest files will be placed
# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.

parameters:
PackageVersion: 7.0.0
BuildDropPath: '$(Build.SourcesDirectory)/artifacts'
PackageName: '.NET'
ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom
IgnoreDirectories: ''
sbomContinueOnError: true

steps:
Expand All @@ -34,6 +36,8 @@ steps:
BuildDropPath: ${{ parameters.buildDropPath }}
PackageVersion: ${{ parameters.packageVersion }}
ManifestDirPath: ${{ parameters.manifestDirPath }}
${{ if ne(parameters.IgnoreDirectories, '') }}:
AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}'

- task: PublishPipelineArtifact@1
displayName: Publish SBOM manifest
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.100-rc.1.22431.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22479.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22479.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22479.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22480.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22480.2",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22475.4"
Expand Down

0 comments on commit 1c2a84d

Please sign in to comment.