mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merged PR 25782: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20220913.7
- **Date Produced**: September 14, 2022 2:42:03 AM UTC
- **Commit**: 2fbe602d12256bf82de53791ddcbb964c1541b4e
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.22412.2 to 6.0.0-beta.22463.7][1]

[1]: 41323ec...2fbe602

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.109

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
This commit is contained in:
DotNet Bot 2022-09-16 22:18:18 +00:00 committed by Marc Paine
commit b552d81dba
7 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22412.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22412.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.22463.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22412.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22463.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>41323ecb0b2312980381bfdbb75afd2dae2b266b</Sha>
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22426.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22412.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

2
eng/common/templates/job/execute-sdl.yml
View file

@ -53,7 +53,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- checkout: self

4
eng/common/templates/job/source-build.yml
View file

@ -46,10 +46,10 @@ jobs:
# source-build builds run in Docker, including the default managed platform.
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if ne(parameters.platform.pool, '') }}:
pool: ${{ parameters.platform.pool }}

2
eng/common/templates/jobs/jobs.yml
View file

@ -89,7 +89,7 @@ jobs:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
runAsPublic: ${{ parameters.runAsPublic }}

8
eng/common/templates/post-build/post-build.yml
View file

@ -100,7 +100,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
@ -137,7 +137,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@ -197,7 +197,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml
@ -254,7 +254,7 @@ stages:
demands: Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Internal
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals windows.vs2019.amd64
steps:
- template: setup-maestro-vars.yml

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.108",
"dotnet": "6.0.109",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22412.2",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22412.2"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22463.7"
}
}