Skip to content

Commit 5a1e982

Browse files
ViktorHofermmitche
ViktorHofer
and
mmitche
authored
Remove live runtime dependencies (#8138)
* Remove live runtime dependencies ... use the shared framework that comes with the SDK instead. We determined that a live runtime doesn't provide much benefit anymore and in contrast often causes pain when flowing dependencies to dotnet/sdk. * Remove internal runtime args --------- Co-authored-by: Matt Mitchell (.NET) <[email protected]>
1 parent 7bee91d commit 5a1e982

8 files changed

+5
-76
lines changed

‎Directory.Build.targets

-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,6 @@
22

33
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
44

5-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(BuildingInsideVisualStudio)' != 'true'">
6-
<FrameworkReference
7-
Update="Microsoft.NETCore.App"
8-
TargetingPackVersion="$(MicrosoftNETCoreAppRefPackageVersion)"
9-
RuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)" />
10-
</ItemGroup>
11-
125
<ItemGroup>
136
<None Include="$(RepoRoot)LICENSE.txt" PackagePath="LICENSE.txt" Pack="true" />
147
<None Include="$(RepoRoot)THIRD-PARTY-NOTICES.txt" PackagePath="THIRD-PARTY-NOTICES.txt" Pack="true" />

‎azure-pipelines-pr.yml

+1-24
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ variables:
2929
value: false
3030
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
3131
- group: Templating-SDLValidation-Params
32-
33-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
34-
# Variable replaced by enable-internal-runtimes.yml
35-
- name: _InternalRuntimeDownloadArgs
36-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
37-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
38-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
39-
- name: _InternalRuntimeDownloadArgs
40-
value: ''
4132
- template: /eng/common/templates/variables/pool-providers.yml
4233

4334
stages:
@@ -106,16 +97,12 @@ stages:
10697
- checkout: self
10798
clean: true
10899

109-
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
110-
- template: /eng/common/templates/steps/enable-internal-sources.yml
111-
112100
# Use utility script to run script command dependent on agent OS.
113101
- script: eng/common/cibuild.cmd
114102
-configuration $(_BuildConfig)
115103
-prepareMachine
116104
-integrationTest
117105
$(_InternalBuildArgs)
118-
$(_InternalRuntimeDownloadArgs)
119106
displayName: Windows Build / Publish
120107

121108
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
@@ -131,23 +118,18 @@ stages:
131118
_BuildConfig: Release
132119
_SignType: none
133120
steps:
134-
135-
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
136-
- template: /eng/common/templates/steps/enable-internal-sources.yml
137-
138121
- script: eng/common/cibuild.sh
139122
--configuration $(_BuildConfig)
140123
--prepareMachine
141124
--integrationTest
142-
$(_InternalRuntimeDownloadArgs)
143125
name: Build
144126
displayName: Build
145127

146128
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
147129
- job: Linux
148130
pool:
149131
${{ if eq(variables['System.TeamProject'], 'public') }}:
150-
vmImage: ubuntu-latest
132+
vmImage: ubuntu-latest
151133
${{ if eq(variables['System.TeamProject'], 'internal') }}:
152134
name: $(DncEngInternalBuildPool)
153135
demands: ImageOverride -equals Build.Ubuntu.2204.Amd64
@@ -160,15 +142,10 @@ stages:
160142
_BuildConfig: Release
161143
_SignType: none
162144
steps:
163-
164-
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
165-
- template: /eng/common/templates/steps/enable-internal-sources.yml
166-
167145
- script: eng/common/cibuild.sh
168146
--configuration $(_BuildConfig)
169147
--prepareMachine
170148
--integrationTest
171-
$(_InternalRuntimeDownloadArgs)
172149
name: Build
173150
displayName: Build
174151
condition: succeeded()

‎azure-pipelines.yml

+3-25
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ variables:
2929
value: false
3030
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
3131
- group: Templating-SDLValidation-Params
32-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
33-
# Variable replaced by enable-internal-runtimes.yml
34-
- name: _InternalRuntimeDownloadArgs
35-
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
36-
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
37-
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
38-
- name: _InternalRuntimeDownloadArgs
39-
value: ''
4032
- template: /eng/common/templates-official/variables/pool-providers.yml
4133

4234
resources:
@@ -106,7 +98,7 @@ extends:
10698
- _SignType: test
10799
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
108100
- _SignType: real
109-
- _InternalBuildArgs: ''
101+
- _InternalBuildArgs: ''
110102
# Only enable publishing in non-public, non PR scenarios.
111103
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
112104
# DotNet-Symbol-Server-Pats provides: microsoft-symbol-server-pat, symweb-symbol-server-pat
@@ -119,16 +111,12 @@ extends:
119111
- checkout: self
120112
clean: true
121113

122-
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
123-
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
124-
125114
# Use utility script to run script command dependent on agent OS.
126115
- script: eng/common/cibuild.cmd
127116
-configuration $(_BuildConfig)
128117
-prepareMachine
129118
-integrationTest
130119
$(_InternalBuildArgs)
131-
$(_InternalRuntimeDownloadArgs)
132120
displayName: Windows Build / Publish
133121

134122
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
@@ -141,18 +129,13 @@ extends:
141129
- _BuildConfig: ${{ config.buildConfig }}
142130
- _SignType: none
143131
steps:
144-
145-
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
146-
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
147-
148132
- script: eng/common/cibuild.sh
149133
--configuration $(_BuildConfig)
150134
--prepareMachine
151135
--integrationTest
152-
$(_InternalRuntimeDownloadArgs)
153136
name: Build
154137
displayName: Build
155-
138+
156139
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
157140
- ${{ each config in parameters.buildConfigurations }}:
158141
- job: Linux_${{ config.buildConfig }}
@@ -170,19 +153,14 @@ extends:
170153
- _BuildConfig: ${{ config.buildConfig }}
171154
- _SignType: none
172155
steps:
173-
174-
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
175-
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
176-
177156
- script: eng/common/cibuild.sh
178157
--configuration $(_BuildConfig)
179158
--prepareMachine
180159
--integrationTest
181-
$(_InternalRuntimeDownloadArgs)
182160
name: Build
183161
displayName: Build
184162
condition: succeeded()
185-
163+
186164
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
187165
- template: eng/common/templates-official/post-build/post-build.yml@self
188166
parameters:

‎eng/SourceBuildPrebuiltBaseline.xml

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33

44
<UsageData>
55
<IgnorePatterns>
6-
<!-- TODO: Ignore needed until https://github.com/dotnet/source-build/issues/3188 is addressed. -->
7-
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/*" />
86
</IgnorePatterns>
97
</UsageData>

‎eng/Version.Details.xml

-8
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
<Sha>9ae78a4e6412926d19ba97cfed159bf9de70b538</Sha>
1414
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.6.24316.2">
17-
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70</Sha>
19-
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.6.24316.2">
21-
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70</Sha>
23-
</Dependency>
2416
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.24209.3">
2517
<Uri>https://github.com/dotnet/command-line-api</Uri>
2618
<Sha>963d34b1fb712c673bfb198133d7e988182c9ef4</Sha>

‎eng/Versions.props

-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,5 @@
1515
<PropertyGroup>
1616
<!-- Command-line-api dependencies -->
1717
<SystemCommandLinePackageVersion>2.0.0-beta4.24209.3</SystemCommandLinePackageVersion>
18-
<!-- Runtime dependencies -->
19-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRefPackageVersion>
20-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.6.24316.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
2118
</PropertyGroup>
2219
</Project>

‎global.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24307.3",
4-
"runtimes": {
5-
"dotnet": [
6-
"$(MicrosoftNETCoreAppRefPackageVersion)"
7-
]
8-
}
3+
"dotnet": "9.0.100-preview.5.24307.3"
94
},
105
"msbuild-sdks": {
116
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24317.3"

‎template_feed/Microsoft.TemplateEngine.Authoring.Templates/Microsoft.TemplateEngine.Authoring.Templates.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</PropertyGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Remove="Microsoft.NETCore.App" />
2827
<Content Include="content\**">
2928
<PackagePath>content</PackagePath>
3029
</Content>

0 commit comments

Comments
 (0)