Skip to content

[main] Update dependencies from dotnet/arcade #6021

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

Merged
merged 1 commit into from
Jan 27, 2022
Merged

[main] Update dependencies from dotnet/arcade #6021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22076.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22076.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22076.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22076.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22076.9">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>93656ab81d1b7f4507edc971465ef2e640694e64</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22075.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22075.6</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22075.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22076.9</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>7.0.0-beta.22076.9</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22076.9</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
Expand Down
4 changes: 4 additions & 0 deletions eng/common/templates/job/job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ parameters:
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishUsingPipelines: false
disableComponentGovernance: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
Expand Down Expand Up @@ -137,6 +138,9 @@ jobs:
richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin
continueOnError: true

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
- task: ComponentGovernanceComponentDetection@0

- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- task: MicroBuildCleanup@1
Expand Down
4 changes: 0 additions & 4 deletions eng/common/templates/job/publish-build-assets.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@ jobs:
value: ${{ parameters.configuration }}
- group: Publish-Build-Assets
- group: AzureDevOps-Artifact-Feeds-Pats
# Skip component governance and codesign validation for SDL. These jobs
# create no content.
- name: skipComponentGovernanceDetection
value: true
- name: runCodesignValidationInjection
value: false

Expand Down
4 changes: 4 additions & 0 deletions eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ parameters:
# Optional: Enable publishing using release pipelines
enablePublishUsingPipelines: false

# Optional: Disable component governance detection. In general, component governance
# should be on for all jobs. Use only in the event of issues.
disableComponentGovernance: false

# Optional: Enable running the source-build jobs to build repo from source
enableSourceBuild: false

Expand Down
4 changes: 0 additions & 4 deletions eng/common/templates/post-build/common-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,5 @@ variables:
- name: SymbolToolVersion
value: 1.0.1

# Skip component governance and codesign validation for SDL. These jobs
# create no content.
- name: skipComponentGovernanceDetection
value: true
- name: runCodesignValidationInjection
value: false
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22076.9"
},
"sdk": {
"version": "7.0.100-alpha.1.22053.1"
Expand Down