Skip to content

[main] Update dependencies from dotnet/arcade dotnet/icu dotnet/xharness dotnet/emsdk #64098

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
marek-safar merged 4 commits into from
Jan 24, 2022
Merged

[main] Update dependencies from dotnet/arcade dotnet/icu dotnet/xharness dotnet/emsdk #64098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e46de8d
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Jan 21, 2022
65c5754
Update dependencies from https://github.com/dotnet/arcade build 20220…
dotnet-maestro[bot] Jan 22, 2022
c5c91f2
Update dependencies from https://github.com/dotnet/icu build 20220121.2
dotnet-maestro[bot] Jan 22, 2022
9c02e8b
Update dependencies from https://github.com/dotnet/emsdk build 202201…
dotnet-maestro[bot] Jan 22, 2022
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
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.22067.1",
"version": "1.0.0-prerelease.22071.1",
"commands": [
"xharness"
]
Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-alpha.1.22067.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="7.0.0-preview.2.22071.2">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>4170ccfbbcada3e22aa4428a84524fabef006e38</Sha>
<Sha>8a4a45cc99e7d6e5244c16f581171633091b96b3</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="7.0.0-alpha.1.21529.3">
<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.1.21601.1">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-alpha.2.22071.3">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>4eb953d7051890da4f36167125c6b41e06d7f56d</Sha>
<Sha>aaa56a6622c4991cf65d553250af3c0ade1320bc</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.22068.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22068.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</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 @@ -238,21 +238,21 @@
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>e485816b48273d03bd6266a64dad9bea97f861d5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22067.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22071.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3060cda4543b80824a9238bcd176bb1a5af72044</Sha>
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22067.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.22071.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3060cda4543b80824a9238bcd176bb1a5af72044</Sha>
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22067.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.22071.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3060cda4543b80824a9238bcd176bb1a5af72044</Sha>
<Sha>bd2a12f9cc6c93c249f987b42c1c761550369674</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22068.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="7.0.0-beta.22071.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9ffc76ac9f5799de9b28ee59f9bfbe0f8844d0d7</Sha>
<Sha>e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21577.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>2.0.0-alpha.1.21525.11</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22068.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22068.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22068.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22068.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22068.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22068.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22068.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22068.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22068.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22068.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>7.0.0-beta.22071.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22071.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>7.0.0-beta.22071.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22071.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22071.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22071.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>7.0.0-beta.22071.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22071.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22071.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>7.0.0-beta.22071.6</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -160,9 +160,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22067.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22067.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22067.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>1.0.0-prerelease.22071.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.22071.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.22071.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.22069.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.2-pre.22</XUnitVersion>
<XUnitAnalyzersVersion>0.12.0-pre.20</XUnitAnalyzersVersion>
Expand All @@ -180,7 +180,7 @@
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22063.2</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-alpha.1.22067.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-preview.2.22071.2</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>7.0.0-alpha.1.21529.3</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
Expand All @@ -193,7 +193,7 @@
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22067.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22067.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.1.21601.1</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETWorkloadEmscriptenManifest70100Version>7.0.0-alpha.2.22071.3</MicrosoftNETWorkloadEmscriptenManifest70100Version>
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100Version)</MicrosoftNETRuntimeEmscriptenVersion>
<!-- workloads -->
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
Expand Down
7 changes: 7 additions & 0 deletions eng/common/internal/NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-core-internal" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal/nuget/v3/index.json" />
</packageSources>
</configuration>
13 changes: 4 additions & 9 deletions eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,6 @@ parameters:
# Optional: download a list of pipeline artifacts. 'downloadArtifacts' controls build artifacts,
# not pipeline artifacts, so doesn't affect the use of this parameter.
pipelineArtifactNames: []
# Optional: location and ID of the AzDO build that the build/pipeline artifacts should be
# downloaded from. By default, uses runtime expressions to decide based on the variables set by
# the 'setupMaestroVars' dependency. Overriding this parameter is necessary if SDL tasks are
# running without Maestro++/BAR involved, or to download artifacts from a specific existing build
# to iterate quickly on SDL changes.
AzDOProjectName: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOProjectName'] ]
AzDOPipelineId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOPipelineId'] ]
AzDOBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.AzDOBuildId'] ]

jobs:
- job: Run_SDL
Expand All @@ -55,11 +47,14 @@ jobs:
- name: GuardianVersion
value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
pool:
vmImage: windows-2019
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019
steps:
- checkout: self
clean: true

- template: /eng/common/templates/post-build/setup-maestro-vars.yml

- ${{ if ne(parameters.downloadArtifacts, 'false')}}:
- ${{ if ne(parameters.artifactNames, '') }}:
- ${{ each artifactName in parameters.artifactNames }}:
Expand Down
3 changes: 2 additions & 1 deletion eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ parameters:

# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool:
vmImage: 'windows-2019'
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019

CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
Expand Down
4 changes: 3 additions & 1 deletion eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
vmImage: 'windows-2019'
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Server.Amd64.VS2019

runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
Loading