Skip to content

Commit 3216e8d

Browse files
authored
Revert "[main] Update dependencies from dotnet/arcade" (#17345)
1 parent 075e884 commit 3216e8d

File tree

12 files changed

+3
-233
lines changed

12 files changed

+3
-233
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
</Dependency>
3131
</ProductDependencies>
3232
<ToolsetDependencies>
33-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24324.1">
33+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24311.3">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>748cd976bf8b0f69b809e569943635ab8be36dc8</Sha>
35+
<Sha>c214b6ad17aedca4fa48294d80f6c52ef2463081</Sha>
3636
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

eng/common/templates-official/job/source-build.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34-
# If set to true and running on a non-public project,
35-
# Internal blob storage locations will be enabled.
36-
# This is not enabled by default because many repositories do not need internal sources
37-
# and do not need to have the required service connections approved in the pipeline.
38-
enableInternalSources: false
39-
4034
jobs:
4135
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
4236
displayName: Source-Build (${{ parameters.platform.name }})
@@ -68,8 +62,6 @@ jobs:
6862
clean: all
6963

7064
steps:
71-
- ${{ if eq(parameters.enableInternalSources, true) }}:
72-
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
7365
- template: /eng/common/templates-official/steps/source-build.yml
7466
parameters:
7567
platform: ${{ parameters.platform }}

eng/common/templates-official/jobs/source-build.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24-
# If set to true and running on a non-public project,
25-
# Internal nuget and blob storage locations will be enabled.
26-
# This is not enabled by default because many repositories do not need internal sources
27-
# and do not need to have the required service connections approved in the pipeline.
28-
enableInternalSources: false
29-
3024
jobs:
3125

3226
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -44,11 +38,9 @@ jobs:
4438
parameters:
4539
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4640
platform: ${{ platform }}
47-
enableInternalSources: ${{ parameters.enableInternalSources }}
4841

4942
- ${{ if eq(length(parameters.platforms), 0) }}:
5043
- template: /eng/common/templates-official/job/source-build.yml
5144
parameters:
5245
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5346
platform: ${{ parameters.defaultManagedPlatform }}
54-
enableInternalSources: ${{ parameters.enableInternalSources }}

eng/common/templates-official/steps/enable-internal-runtimes.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

eng/common/templates-official/steps/get-delegation-sas.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

eng/common/templates-official/steps/get-federated-access-token.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

eng/common/templates/job/source-build.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ parameters:
3131
# container and pool.
3232
platform: {}
3333

34-
# If set to true and running on a non-public project,
35-
# Internal blob storage locations will be enabled.
36-
# This is not enabled by default because many repositories do not need internal sources
37-
# and do not need to have the required service connections approved in the pipeline.
38-
enableInternalSources: false
39-
4034
jobs:
4135
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
4236
displayName: Source-Build (${{ parameters.platform.name }})
@@ -67,8 +61,6 @@ jobs:
6761
clean: all
6862

6963
steps:
70-
- ${{ if eq(parameters.enableInternalSources, true) }}:
71-
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
7264
- template: /eng/common/templates/steps/source-build.yml
7365
parameters:
7466
platform: ${{ parameters.platform }}

eng/common/templates/jobs/source-build.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ parameters:
2121
# one job runs on 'defaultManagedPlatform'.
2222
platforms: []
2323

24-
# If set to true and running on a non-public project,
25-
# Internal nuget and blob storage locations will be enabled.
26-
# This is not enabled by default because many repositories do not need internal sources
27-
# and do not need to have the required service connections approved in the pipeline.
28-
enableInternalSources: false
29-
3024
jobs:
3125

3226
- ${{ if ne(parameters.allCompletedJobId, '') }}:
@@ -44,11 +38,9 @@ jobs:
4438
parameters:
4539
jobNamePrefix: ${{ parameters.jobNamePrefix }}
4640
platform: ${{ platform }}
47-
enableInternalSources: ${{ parameters.enableInternalSources }}
4841

4942
- ${{ if eq(length(parameters.platforms), 0) }}:
5043
- template: /eng/common/templates/job/source-build.yml
5144
parameters:
5245
jobNamePrefix: ${{ parameters.jobNamePrefix }}
5346
platform: ${{ parameters.defaultManagedPlatform }}
54-
enableInternalSources: ${{ parameters.enableInternalSources }}

eng/common/templates/steps/enable-internal-runtimes.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

eng/common/templates/steps/get-delegation-sas.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)