Skip to content

Commit 37a2b23

Browse files
MichaelSimonsMichaelSimons
authored
Merge branch 'main' into marcpopMSFT-updateMAI
2 parents d6fac86 + 3334385 commit 37a2b23

File tree

685 files changed

+6846
-4489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

685 files changed

+6846
-4489
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25175.1",
6+
"version": "1.1.0-beta.25201.1",
77
"commands": [
88
"darc"
99
]

‎.vsts-ci.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ extends:
106106
oneESCompat:
107107
templateFolderName: templates-official
108108
publishTaskPrefix: 1ES.
109-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
109+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
110110
locBranch: release/9.0.3xx
111111
# WORKAROUND: BinSkim requires the folder exist prior to scanning.
112112
preSteps:
@@ -126,15 +126,15 @@ extends:
126126
variables:
127127
_SignType: real
128128
- categoryName: Official
129-
buildArchitecture: x86
129+
targetArchitecture: x86
130130
publishArgument: $(_publishArgument)
131131
signArgument: $(_signArgument)
132132
officialBuildProperties: $(_officialBuildProperties)
133133
runTests: false
134134
variables:
135135
_SignType: real
136136
- categoryName: Official
137-
buildArchitecture: arm64
137+
targetArchitecture: arm64
138138
publishArgument: $(_publishArgument)
139139
signArgument: $(_signArgument)
140140
officialBuildProperties: $(_officialBuildProperties)
@@ -152,7 +152,7 @@ extends:
152152
_SignType: real
153153
- categoryName: PGO
154154
pgoInstrument: true
155-
buildArchitecture: x86
155+
targetArchitecture: x86
156156
publishArgument: $(_publishArgument)
157157
signArgument: $(_signArgument)
158158
officialBuildProperties: $(_officialBuildProperties)
@@ -161,7 +161,7 @@ extends:
161161
_SignType: real
162162
- categoryName: PGO
163163
pgoInstrument: true
164-
buildArchitecture: arm64
164+
targetArchitecture: arm64
165165
publishArgument: $(_publishArgument)
166166
signArgument: $(_signArgument)
167167
officialBuildProperties: $(_officialBuildProperties)
@@ -180,7 +180,7 @@ extends:
180180
oneESCompat:
181181
templateFolderName: templates-official
182182
publishTaskPrefix: 1ES.
183-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
183+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
184184
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
185185
timeoutInMinutes: 90
186186
linuxJobParameterSets:
@@ -192,14 +192,14 @@ extends:
192192
osProperties: $(linuxOsPortableProperties)
193193
runTests: false
194194
- categoryName: Official
195-
buildArchitecture: arm
195+
targetArchitecture: arm
196196
runtimeIdentifier: linux-arm
197197
publishArgument: $(_publishArgument)
198198
officialBuildProperties: $(_officialBuildProperties)
199199
osProperties: $(linuxOsPortableProperties)
200200
runTests: false
201201
- categoryName: Official
202-
buildArchitecture: arm64
202+
targetArchitecture: arm64
203203
runtimeIdentifier: linux-arm64
204204
publishArgument: $(_publishArgument)
205205
officialBuildProperties: $(_officialBuildProperties)
@@ -213,10 +213,10 @@ extends:
213213
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
214214
runTests: false
215215
- categoryName: Portable
216-
buildArchitecture: arm64
216+
targetArchitecture: arm64
217217
runtimeIdentifier: linux-arm64
218218
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
219-
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
219+
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
220220
officialBuildProperties: $(_officialBuildProperties)
221221
osProperties: $(linuxOsPortableProperties) /p:BuildSdkDeb=true
222222
runTests: false
@@ -229,10 +229,10 @@ extends:
229229
runTests: false
230230
- categoryName: Portable
231231
container: centosStream9
232-
buildArchitecture: arm64
232+
targetArchitecture: arm64
233233
runtimeIdentifier: linux-arm64
234234
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
235-
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
235+
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
236236
officialBuildProperties: $(_officialBuildProperties)
237237
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
238238
runTests: false
@@ -249,14 +249,14 @@ extends:
249249
runTests: false
250250
- categoryName: Musl
251251
container: mariner20CrossArm
252-
buildArchitecture: arm
252+
targetArchitecture: arm
253253
runtimeIdentifier: linux-musl-arm
254254
publishArgument: $(_publishArgument)
255255
officialBuildProperties: $(_officialBuildProperties)
256256
osProperties: /p:OSName=linux-musl
257257
runTests: false
258258
- categoryName: Musl
259-
buildArchitecture: arm64
259+
targetArchitecture: arm64
260260
runtimeIdentifier: linux-musl-arm64
261261
publishArgument: $(_publishArgument)
262262
officialBuildProperties: $(_officialBuildProperties)
@@ -271,7 +271,7 @@ extends:
271271
runTests: false
272272
- categoryName: PGO
273273
pgoInstrument: true
274-
buildArchitecture: arm64
274+
targetArchitecture: arm64
275275
runtimeIdentifier: linux-arm64
276276
publishArgument: $(_publishArgument)
277277
officialBuildProperties: $(_officialBuildProperties)
@@ -289,7 +289,7 @@ extends:
289289
oneESCompat:
290290
templateFolderName: templates-official
291291
publishTaskPrefix: 1ES.
292-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
292+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
293293
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
294294
timeoutInMinutes: 90
295295
macOSJobParameterSets:
@@ -300,7 +300,7 @@ extends:
300300
officialBuildProperties: $(_officialBuildProperties)
301301
runTests: false
302302
- categoryName: Official
303-
buildArchitecture: arm64
303+
targetArchitecture: arm64
304304
runtimeIdentifier: osx-arm64
305305
publishArgument: $(_publishArgument)
306306
officialBuildProperties: $(_officialBuildProperties)
@@ -313,10 +313,10 @@ extends:
313313
name: Azure Pipelines
314314
vmImage: macOS-latest
315315
os: macOS
316-
helixTargetQueue: osx.15.arm64
316+
helixTargetQueue: osx.13.arm64
317317
macOSJobParameterSets:
318318
- categoryName: TestBuild
319-
buildArchitecture: arm64
319+
targetArchitecture: arm64
320320
runtimeIdentifier: osx-arm64
321321

322322
############### DOTNET-FORMAT ###############
@@ -325,7 +325,7 @@ extends:
325325
parameters:
326326
oneESCompat:
327327
publishTaskPrefix: 1ES.
328-
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
328+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
329329

330330
############### PUBLISH STAGE ###############
331331
- ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:

‎.vsts-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ stages:
7777
name: Azure Pipelines
7878
vmImage: macOS-latest
7979
os: macOS
80-
helixTargetQueue: osx.15.arm64.open
80+
helixTargetQueue: osx.13.arm64.open
8181
macOSJobParameterSets:
8282
- categoryName: TestBuild
83-
buildArchitecture: arm64
83+
targetArchitecture: arm64
8484
runtimeIdentifier: osx-arm64
8585

8686
############### DOTNET-FORMAT ###############

‎Directory.Build.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
<PropertyGroup>
66
<BuildArchitecture Condition="'$(BuildArchitecture)' == ''">$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
7-
<Architecture Condition="'$(Architecture)' == '' AND ('$(BuildArchitecture)' == 'arm64')">$(BuildArchitecture)</Architecture>
8-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</Architecture>
9-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</Architecture>
10-
<Architecture Condition="'$(Architecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</Architecture>
11-
<Architecture Condition="'$(Architecture)' == ''">x64</Architecture>
7+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND ('$(BuildArchitecture)' == 'arm64')">$(BuildArchitecture)</TargetArchitecture>
8+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 's390x'">$(BuildArchitecture)</TargetArchitecture>
9+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 'ppc64le'">$(BuildArchitecture)</TargetArchitecture>
10+
<TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(BuildArchitecture)' == 'loongarch64'">$(BuildArchitecture)</TargetArchitecture>
11+
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
1212
<Nullable>enable</Nullable>
1313
</PropertyGroup>
1414

@@ -23,7 +23,7 @@
2323
<HostOSName Condition="'$(HostOSName)' == '' AND $([MSBuild]::IsOSPlatform('ILLUMOS'))">illumos</HostOSName>
2424
<HostOSName Condition="'$(HostOSName)' == '' AND '$(IsLinux)' == 'true'">linux</HostOSName>
2525

26-
<OSName Condition="'$(OSName)' == '' AND $(Rid) != ''">$(Rid.Substring(0, $(Rid.LastIndexOf('-'))))</OSName>
26+
<OSName Condition="'$(OSName)' == '' AND $(TargetRid) != ''">$(TargetRid.Substring(0, $(TargetRid.LastIndexOf('-'))))</OSName>
2727
<OSName Condition="'$(OSName)' == ''">$(HostOSName)</OSName>
2828
</PropertyGroup>
2929

‎documentation/general/dotnet-run-file.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,14 @@ Directives `sdk`, `package`, and `property` are translated into `<Project Sdk=".
183183
Other directives result in a warning, reserving them for future use.
184184

185185
```cs
186-
#:sdk Microsoft.NET.Sdk.Web
187-
#:property TargetFramework=net11.0
188-
#:property LangVersion=preview
189-
#:package System.CommandLine=2.0.0-*
186+
#:sdk Microsoft.NET.Sdk.Web
187+
#:property TargetFramework net11.0
188+
#:property LangVersion preview
189+
#:package System.CommandLine 2.0.0-*
190190
```
191191

192192
The value must be separated from the name of the directive by white space and any leading and trailing white space is not considered part of the value.
193-
Any value can optionally have two parts separated by `=` or `/`
194-
(the former is consistent with how properties are usually passed, e.g., `/p:Prop=Value`, and the latter is what the `<Project Sdk="Name/Version">` attribute uses).
193+
Any value can optionally have two parts separated by a space (more whitespace characters could be allowed in the future).
195194
The value of the first `#:sdk` is injected into `<Project Sdk="{0}">` with the separator (if any) replaced with `/`,
196195
and the subsequent `#:sdk` directive values are split by the separator and injected as `<Sdk Name="{0}" Version="{1}" />` elements (or without the `Version` attribute if there is no separator).
197196
It is an error if the first part (name) is empty (the version is allowed to be empty, but that results in empty `Version=""`).

‎eng/Badge.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<Target Name="GenerateVersionBadge" AfterTargets="Build" Returns="$(VersionBadge)">
99
<PropertyGroup>
1010
<!-- Replace '-' with '_' for os names like 'linux-musl' -->
11-
<VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(Architecture)</VersionBadgeMoniker>
12-
<VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(Architecture)</VersionBadgeMoniker>
11+
<VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(TargetArchitecture)</VersionBadgeMoniker>
12+
<VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(TargetArchitecture)</VersionBadgeMoniker>
1313

1414
<VersionBadge>$(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
1515
<VersionSvgTemplate>$(MSBuildThisFileDirectory)version_badge.svg</VersionSvgTemplate>

‎eng/Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
they depend on assets from other verticals that are built in the first build pass. -->
55
<ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
66
'$(OS)' == 'Windows_NT' and
7-
'$(Architecture)' == 'x64'">
7+
'$(TargetArchitecture)' == 'x64'">
88
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions\VS.Redist.Common.Net.Core.SDK.MSBuildExtensions.proj" DotNetBuildPass="2" />
99
<ProjectToBuild Include="$(RepoRoot)src\Layout\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator\VS.Redist.Common.Net.Core.SDK.VSTemplateLocator.proj" DotNetBuildPass="2" />
1010
</ItemGroup>

‎eng/Publishing.props‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,23 @@
77
</PropertyGroup>
88

99
<!-- FSharp needs to push different packages to nuget.org depending on whether the SDK is preview or not,
10-
To achieve this, we find the FSharp compiler package, then the stable or non-stable FSharp.Core and Compiler service
11-
package contained within, depending on the stability switch of the SDK. The SDK then treats these packages as its own outputs,
12-
which means they get automatically pushed on release day.
10+
To achieve this, we find the FSharp compiler package, then the stable or non-stable FSharp.Core and Compiler service
11+
package contained within, depending on the stability switch of the SDK. The SDK then treats these packages as its own outputs,
12+
which means they get automatically pushed on release day.
1313
14-
These packages have already been signed by the FSharp build so we don't need to re-include them for signing. -->
14+
These packages have already been signed by the FSharp build so we don't need to re-include them for signing. -->
1515
<PropertyGroup Condition="'$(EnableDefaultArtifacts)' == 'true'">
1616
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' != 'release'">Shipping</FSharpCorePath>
1717
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)' == 'release'">Release</FSharpCorePath>
18+
1819
<!--
1920
We only want to publish the FSharp assets externally when we're publishing all artifacts, not only RID-specific ones.
2021
Add these packages as "Vertical" visibility when we're only publishing RID-specific packages so we don't publish this one.
2122
-->
22-
<FSharpArtifactVisibility Condition="'$(EnableDefaultRidSpecificArtifacts)' == 'true' or ('$(DotNetBuildPass)' != '' and '$(DotNetBuildPass)' != '1')">Vertical</FSharpArtifactVisibility>
23+
<FSharpArtifactVisibility Condition="'$(EnableDefaultRidSpecificArtifacts)' == 'true'">Vertical</FSharpArtifactVisibility>
2324
<FSharpArtifactVisibility Condition="'$(FSharpArtifactVisibility)' == ''">External</FSharpArtifactVisibility>
2425
</PropertyGroup>
25-
<ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true'">
26+
<ItemGroup Condition="'$(EnableDefaultArtifacts)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
2627
<Artifact Include="$(NuGetPackageRoot)\microsoft.fsharp.compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Core.*.nupkg;
2728
$(NuGetPackageRoot)\microsoft.fsharp.compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Compiler.Service.*.nupkg"
2829
Kind="Package"

‎eng/Signing.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</ItemGroup>
8484

8585
<!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
86-
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
86+
<ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(TargetArchitecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
8787
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />
8888
<SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" />
8989
</ItemGroup>

0 commit comments

Comments
 (0)