Skip to content

Commit 190a47e

Browse files
authored
Merge pull request dotnet#65974 from dotnet/backport/pr-65901-to-release/7.0-preview2
[release/7.0-preview2] Remove usages of native bootstrapping
2 parents ff972c6 + 30823b4 commit 190a47e

File tree

8 files changed

+1
-27
lines changed

8 files changed

+1
-27
lines changed

eng/pipelines/common/global-build-job.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ jobs:
148148
inputs:
149149
filePath: $(Build.SourcesDirectory)/eng/pipelines/mono/update-machine-certs.ps1
150150

151-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
152-
displayName: Install native dependencies
153-
154151
# Build
155152
- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
156153
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)

eng/pipelines/common/templates/runtimes/build-test-job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ jobs:
102102
- ${{ if eq(parameters.osGroup, 'OSX') }}:
103103
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO
104104
displayName: Install native dependencies
105-
- ${{ if eq(parameters.osGroup, 'windows') }}:
106-
# Necessary to install correct cmake version
107-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
108-
displayName: Install native dependencies
109105

110106
# Build core/libraries dependencies of test build
111107
- script: $(Build.SourcesDirectory)/build$(scriptExt) $(liveRuntimeBuildParams) $(compilerArg)

eng/pipelines/coreclr/templates/build-jit-job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ jobs:
8989
- ${{ if eq(parameters.osGroup, 'OSX') }}:
9090
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO
9191
displayName: Install native dependencies (OSX)
92-
- ${{ if eq(parameters.osGroup, 'windows') }}:
93-
# Necessary to install python
94-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
95-
displayName: Install native dependencies (windows)
9692

9793
# Install internal tools on official builds
9894
# Since our internal tools are behind an authenticated feed,

eng/pipelines/coreclr/templates/build-job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ jobs:
163163
- ${{ if eq(parameters.osGroup, 'OSX') }}:
164164
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO
165165
displayName: Install native dependencies
166-
- ${{ if eq(parameters.osGroup, 'windows') }}:
167-
# Necessary to install python
168-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
169-
displayName: Install native dependencies
170166

171167
# Install internal tools on official builds
172168
# Since our internal tools are behind an authenticated feed,

eng/pipelines/mono/templates/build-job.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@ jobs:
126126
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
127127
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO
128128
displayName: Install native dependencies
129-
- ${{ if eq(parameters.osGroup, 'windows') }}:
130-
# Necessary to install python
131-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
132-
displayName: Install native dependencies
133129

134130
- ${{ each monoCrossAOTTargetOS in parameters.monoCrossAOTTargetOS }}:
135131
- task: DownloadPipelineArtifact@2

eng/pipelines/mono/templates/generate-offsets.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ jobs:
5959
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS') }}:
6060
- script: $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup) ${{ parameters.archType }} azDO
6161
displayName: Install native dependencies
62-
- ${{ if eq(parameters.osGroup, 'windows') }}:
63-
# Necessary to install python
64-
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
65-
displayName: Install native dependencies
6662

6763
# Build
6864
- ${{ if ne(parameters.osGroup, 'windows') }}:

global.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"tools": {
88
"dotnet": "6.0.100"
99
},
10-
"native-tools": {
11-
"cmake": "3.16.4",
12-
"python3": "3.7.1"
13-
},
1410
"msbuild-sdks": {
1511
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22110.7",
1612
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22110.7",

src/mono/mono.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,7 @@
491491
<_MonoCMakeBuildCommand Condition="'$(_MonoUseNinja)' != 'true'">$(_MonoCMakeBuildCommand) --parallel $([System.Environment]::ProcessorCount)</_MonoCMakeBuildCommand>
492492
<_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' != 'true' and '$(HostOS)' != 'windows'">@(_MonoBuildEnv, ' ') $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand>
493493
<_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' != 'true' and '$(HostOS)' == 'windows'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; $(_CompilerTargetArch) &amp;&amp; cd /D &quot;$(MonoObjDir)&quot; &amp;&amp; @(_MonoBuildEnv, ' ') $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand>
494+
<_MonoCMakeBuildCommand Condition="'$(TargetsBrowser)' == 'true' and '$(HostOS)' == 'windows'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; $(_MonoCMakeBuildCommand)</_MonoCMakeBuildCommand>
494495
</PropertyGroup>
495496

496497
<MakeDir Directories="$(MonoObjDir)" />

0 commit comments

Comments
 (0)