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.

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

[main] Update dependencies from dotnet/icu dotnet/arcade dotnet/emsdk dotnet/roslyn-analyzers #64678

Merged
merged 6 commits into from
Feb 3, 2022
82 changes: 41 additions & 41 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>a7213b4676c1803bb251771291a525482d42e511</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.2.22078.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.2.22102.3">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>b581f08ff228099e732aa8c8cde53995a5870901</Sha>
<Sha>8f6606fae08ffa42b025dc42ebe2eea91db3a242</Sha>
</Dependency>
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0-rc2.21473.1">
<Uri>https://github.com/dotnet/wcf</Uri>
Expand Down Expand Up @@ -50,77 +50,77 @@
</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.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</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.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22075.6">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="7.0.0-beta.22102.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -250,9 +250,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>4d24e26939bf0770047cd59299235cf6caa86cdb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22075.6">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22080.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9</Sha>
<Sha>4d6406fa2e84c8516a338694be3a4097e6e1f104</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22078.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand All @@ -278,9 +278,9 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22081.3">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.0-preview1.22102.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>7c544ae66c44f1705ef583b112def4db52c0179a</Sha>
<Sha>60eb13c44c366205e5a4dec195404477009c41de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="2.0.0-alpha.1.21525.11">
<Uri>https://github.com/dotnet/sdk</Uri>
Expand Down
34 changes: 17 additions & 17 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,26 @@
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>4.0.1</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<MicrosoftCodeAnalysisCSharpVersion>4.0.1</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22081.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22102.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22075.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22075.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22075.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22075.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22075.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22075.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22080.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22080.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22080.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22080.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22080.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22080.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>7.0.0-beta.22102.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22075.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22075.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22075.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22075.6</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22080.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22080.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22080.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22080.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -194,7 +194,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22081.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22081.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.2.22078.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.2.22102.3</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/internal/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
</packageSources>
</configuration>
4 changes: 4 additions & 0 deletions eng/common/templates/job/job.yml
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
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
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
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
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22075.6",
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1",
"Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22080.1",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22080.2"
Expand Down