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

[release/8.0.4xx] Switch to dSAS for internal runtimes (#19947)

Browse source
This commit is contained in:
Matt Mitchell 2024-07-02 15:25:21 -07:00 • committed by GitHub
parent 248d81d8a0
commit c932cda6a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.vsts-ci.yml
View file

@ -21,14 +21,12 @@ variables:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: Codeql.Enabled
value: true
- group: DotNet-DotNetCli-Storage
- group: DotNet-Installer-SDLValidation-Params
- name: _PublishUsingPipelines
value: true
- name: _InternalRuntimeDownloadArgs
value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNetBuilds storage account read tokens
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
@ -325,8 +323,10 @@ extends:
buildArchitecture: arm64
runTests: false
# Source Build
- template: /eng/common/templates-official/jobs/source-build.yml@self
# Source Build
- template: /eng/common/templates-official/jobs/source-build.yml@self
parameters:
enableInternalSources: true
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- stage: Publish

4
.vsts-pr.yml
View file

@ -21,7 +21,6 @@ variables:
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: Codeql.Enabled
value: true
- group: DotNet-DotNetCli-Storage
- group: DotNet-Installer-SDLValidation-Params
- name: _PublishUsingPipelines
value: true
@ -30,7 +29,6 @@ variables:
value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNetBuilds storage account read tokens
- name: _InternalRuntimeDownloadArgs
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
@ -347,6 +345,8 @@ stages:
runTests: false
- template: /eng/common/templates/jobs/source-build.yml
parameters:
enableInternalSources: true
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- stage: Publish

12
eng/Version.Details.xml
View file

@ -214,18 +214,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24328.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24352.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>761c516b64fee3941d8909d24205ced835eed83e</Sha>
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24328.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.24352.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>761c516b64fee3941d8909d24205ced835eed83e</Sha>
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24328.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.24352.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>761c516b64fee3941d8909d24205ced835eed83e</Sha>
<Sha>8b879da4e449c48d99f3f642fc429379a64e8fe8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24328.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.24352.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

1
eng/build-pr.yml
View file

@ -173,6 +173,7 @@ jobs:
steps:
- checkout: self
clean: true
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
- ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}:
- task: PowerShell@2

1
eng/build.yml
View file

@ -179,6 +179,7 @@ jobs:
steps:
- checkout: self
clean: true
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
- ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}:
- task: PowerShell@2

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24328.2",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24328.2"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1",
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1"
}
}