Skip to content

Commit c20044a

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-161c1a7a-7e64-4452-8008-cd340d858bee
2 parents 8b1a8cc + 027ee0b commit c20044a

File tree

13 files changed

+128
-163
lines changed

13 files changed

+128
-163
lines changed

‎eng/Build.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
<ProjectToBuild Include="$(RepoRoot)src/VirtualMonoRepo/InitializeVMR.proj" BuildInParallel="false" />
77
</ItemGroup>
88

9-
<ItemGroup Condition="'$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1'">
10-
<!-- For product build, build SdkResolver and VSTemplateLocator only in the second build pass as they depend on
11-
assets from other verticals that are built in the first build pass. -->
12-
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\SdkResolver.csproj" DotNetBuildPass="2" />
9+
<!-- For product build, build MSBuildExtensions and VSTemplateLocator only in the second build pass on win-x64 as
10+
they depend on assets from other verticals that are built in the first build pass. -->
11+
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
12+
'$(OS)' == 'Windows_NT' and
13+
'$(Architecture)' == 'x64'">
14+
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSMSBuildExtensions\VSMSBuildExtensions.csproj" DotNetBuildPass="2" />
1315
<ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj" DotNetBuildPass="2" />
1416
</ItemGroup>
1517

‎eng/pipelines/templates/stages/vmr-build.yml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ stages:
8080
- template: ../variables/vmr-build.yml
8181
parameters:
8282
vmrBranch: ${{ parameters.vmrBranch }}
83-
sign: false
8483

8584
jobs:
8685

@@ -101,6 +100,7 @@ stages:
101100
runOnline: true # ✅
102101
useMonoRuntime: false # 🚫
103102
withPreviousSDK: false # 🚫
103+
sign: false
104104

105105
### Additional jobs for lite/full builds ###
106106
- ${{ if in(parameters.scope, 'lite', 'full') }}:
@@ -124,6 +124,7 @@ stages:
124124
# withPreviousSDK: false # 🚫
125125
# reuseBuildArtifactsFrom:
126126
# - ${{ format('{0}_Online_MsftSdk_x64', variables.centOSStreamName) }}
127+
# sign: false
127128

128129
# Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
129130
# - template: ../jobs/vmr-build.yml
@@ -144,6 +145,7 @@ stages:
144145
# runOnline: false # 🚫
145146
# useMonoRuntime: false # 🚫
146147
# withPreviousSDK: true # ✅
148+
# sign: false
147149

148150
### Additional jobs for full build ###
149151
- ${{ if in(parameters.scope, 'full') }}:
@@ -166,6 +168,7 @@ stages:
166168
runOnline: false # 🚫
167169
useMonoRuntime: false # 🚫
168170
withPreviousSDK: false # 🚫
171+
sign: false
169172

170173
- template: ../jobs/vmr-build.yml
171174
parameters:
@@ -184,6 +187,7 @@ stages:
184187
runOnline: true # ✅
185188
useMonoRuntime: false # 🚫
186189
withPreviousSDK: false # 🚫
190+
sign: false
187191

188192
- template: ../jobs/vmr-build.yml
189193
parameters:
@@ -201,6 +205,7 @@ stages:
201205
runOnline: false # 🚫
202206
useMonoRuntime: false # 🚫
203207
withPreviousSDK: false # 🚫
208+
sign: false
204209

205210
# Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
206211
# - template: ../jobs/vmr-build.yml
@@ -220,6 +225,7 @@ stages:
220225
# runOnline: true # ✅
221226
# useMonoRuntime: false # 🚫
222227
# withPreviousSDK: true # ✅
228+
# sign: false
223229

224230
# Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
225231
# - template: ../jobs/vmr-build.yml
@@ -239,6 +245,7 @@ stages:
239245
# runOnline: false # 🚫
240246
# useMonoRuntime: false # 🚫
241247
# withPreviousSDK: true # ✅
248+
# sign: false
242249

243250
- template: ../jobs/vmr-build.yml
244251
parameters:
@@ -256,6 +263,7 @@ stages:
256263
runOnline: false # 🚫
257264
useMonoRuntime: true # ✅
258265
withPreviousSDK: false # 🚫
266+
sign: false
259267

260268
- template: ../jobs/vmr-build.yml
261269
parameters:
@@ -273,6 +281,7 @@ stages:
273281
runOnline: false # 🚫
274282
useMonoRuntime: false # 🚫
275283
withPreviousSDK: false # 🚫
284+
sign: false
276285

277286
- template: ../jobs/vmr-build.yml
278287
parameters:
@@ -290,6 +299,7 @@ stages:
290299
runOnline: false # 🚫
291300
useMonoRuntime: false # 🚫
292301
withPreviousSDK: false # 🚫
302+
sign: false
293303

294304
- template: ../jobs/vmr-build.yml
295305
parameters:
@@ -307,6 +317,7 @@ stages:
307317
runOnline: false # 🚫
308318
useMonoRuntime: false # 🚫
309319
withPreviousSDK: false # 🚫
320+
sign: false
310321

311322
# Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
312323
# - template: ../jobs/vmr-build.yml
@@ -327,6 +338,7 @@ stages:
327338
# withPreviousSDK: false # 🚫
328339
# reuseBuildArtifactsFrom:
329340
# - ${{ format('{0}_Offline_MsftSdk_x64', variables.fedoraName) }}
341+
# sign: false
330342

331343
# Disabled until net9.0 -> net10.0 transition is complete - see https://github.com/dotnet/source-build/issues/4605
332344
# - template: ../jobs/vmr-build.yml
@@ -347,6 +359,7 @@ stages:
347359
# withPreviousSDK: false # 🚫
348360
# reuseBuildArtifactsFrom:
349361
# - ${{ format('{0}_Mono_Offline_MsftSdk_x64', variables.centOSStreamName) }}
362+
# sign: false
350363

351364
#### VERTICAL BUILD ####
352365
- ${{ if not(parameters.isSourceOnlyBuild) }}:

‎sdk.sln

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -499,8 +499,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "finalizer-build", "src\Inst
499499
EndProject
500500
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "redist-installer", "src\Installer\redist-installer\redist-installer.csproj", "{FAADC193-BA41-449D-97CE-0EF82836046A}"
501501
EndProject
502-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\Installer\redist-installer\projects\SdkResolver.csproj", "{27E399C0-6F91-45D6-A63D-041DA41CCFDF}"
503-
EndProject
504502
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VSTemplateLocator", "src\Installer\redist-installer\projects\VSTemplateLocator\VSTemplateLocator.csproj", "{0CBA5FB8-71A3-457A-89F3-E52B9602164A}"
505503
EndProject
506504
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks.Tests", "test\core-sdk-tasks.Tests\core-sdk-tasks.Tests.csproj", "{21C21975-84C1-4A24-8E21-F7EC790A4584}"
@@ -513,6 +511,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Sdk.Compilers
513511
EndProject
514512
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WebTools.AspireService.Tests", "test\Microsoft.WebTools.AspireService.Tests\Microsoft.WebTools.AspireService.Tests.csproj", "{1F0B4B3C-DC88-4740-B04F-1707102E9930}"
515513
EndProject
514+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSMSBuildExtensions", "src\Installer\redist-installer\projects\VSMSBuildExtensions\VSMSBuildExtensions.csproj", "{D9617F63-15F4-4CA2-8ECF-728A94B45D82}"
515+
EndProject
516516
Global
517517
GlobalSection(SolutionConfigurationPlatforms) = preSolution
518518
Debug|Any CPU = Debug|Any CPU
@@ -947,10 +947,6 @@ Global
947947
{FAADC193-BA41-449D-97CE-0EF82836046A}.Debug|Any CPU.Build.0 = Debug|Any CPU
948948
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.ActiveCfg = Release|Any CPU
949949
{FAADC193-BA41-449D-97CE-0EF82836046A}.Release|Any CPU.Build.0 = Release|Any CPU
950-
{27E399C0-6F91-45D6-A63D-041DA41CCFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
951-
{27E399C0-6F91-45D6-A63D-041DA41CCFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
952-
{27E399C0-6F91-45D6-A63D-041DA41CCFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
953-
{27E399C0-6F91-45D6-A63D-041DA41CCFDF}.Release|Any CPU.Build.0 = Release|Any CPU
954950
{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
955951
{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Debug|Any CPU.Build.0 = Debug|Any CPU
956952
{0CBA5FB8-71A3-457A-89F3-E52B9602164A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -971,6 +967,10 @@ Global
971967
{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.Build.0 = Debug|Any CPU
972968
{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.ActiveCfg = Release|Any CPU
973969
{1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.Build.0 = Release|Any CPU
970+
{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
971+
{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Debug|Any CPU.Build.0 = Debug|Any CPU
972+
{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|Any CPU.ActiveCfg = Release|Any CPU
973+
{D9617F63-15F4-4CA2-8ECF-728A94B45D82}.Release|Any CPU.Build.0 = Release|Any CPU
974974
EndGlobalSection
975975
GlobalSection(SolutionProperties) = preSolution
976976
HideSolutionNode = FALSE
@@ -1142,13 +1142,13 @@ Global
11421142
{5593C59B-442B-4783-8527-74F6E41668D9} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11431143
{32DA04FF-A951-43EA-B2FA-86A825009A97} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11441144
{FAADC193-BA41-449D-97CE-0EF82836046A} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
1145-
{27E399C0-6F91-45D6-A63D-041DA41CCFDF} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11461145
{0CBA5FB8-71A3-457A-89F3-E52B9602164A} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11471146
{21C21975-84C1-4A24-8E21-F7EC790A4584} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
11481147
{19014C60-F87C-4CC7-AC0F-C41B6126EBCE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11491148
{94C8526E-DCC2-442F-9868-3DD0BA2688BE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91}
11501149
{FA579C03-2EB4-4D47-88EE-BFF339E96FAF} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}
11511150
{1F0B4B3C-DC88-4740-B04F-1707102E9930} = {580D1AE7-AA8F-4912-8B76-105594E00B3B}
1151+
{D9617F63-15F4-4CA2-8ECF-728A94B45D82} = {3FA6F1CB-295B-4414-B18F-93845917A8CD}
11521152
EndGlobalSection
11531153
GlobalSection(ExtensibilityGlobals) = postSolution
11541154
SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}

‎src/Installer/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ public override bool Execute()
2828
@"msbuildExtensions-ver",
2929
@"MSBuild\Current");
3030

31-
File.WriteAllText(OutputFile, sb.ToString());
31+
FileInfo outputFileInfo = new FileInfo(OutputFile);
32+
outputFileInfo.Directory.Create();
33+
File.WriteAllText(outputFileInfo.FullName, sb.ToString());
3234

3335
return true;
3436
}

‎src/Installer/redist-installer/packaging/windows/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.nuspec

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

‎src/Installer/redist-installer/projects/SdkResolver.csproj

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

0 commit comments

Comments
 (0)