Skip to content

Commit 671c95b

Browse files
brianrourkebollbrianrourkeboll
committed
Merge branch 'main' of https://github.com/dotnet/fsharp into record-spreads
2 parents 4df4164 + cfda5f6 commit 671c95b

File tree

9 files changed

+41
-57
lines changed

9 files changed

+41
-57
lines changed

‎Directory.Build.targets‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
<FsYaccPath>$(ArtifactsDir)/bin/fsyacc/$(Configuration)/$(FSharpNetCoreProductDefaultTargetFramework)/$(NETCoreSdkPortableRuntimeIdentifier)/fsyacc.dll</FsYaccPath>
1111
</PropertyGroup>
1212

13+
<ItemGroup Condition="'$(DesignTimeBuild)' == 'true'">
14+
<PackageReference Update="Microsoft.VSSDK.BuildTools" Version="17.14.2120" />
15+
</ItemGroup>
16+
1317
<ItemGroup Condition="'$(UnitTestType)' == 'xunit'">
1418
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
1519
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVersion)" />

‎azure-pipelines-PR.yml‎

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ variables:
5555
value: Release
5656
- name: _PublishUsingPipelines
5757
value: true
58+
- name: _WindowsMachineQueueName
59+
value: windows.vs2026preview.scout.amd64.open
5860
- name: VisualStudioDropName
5961
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
6062
- name: Codeql.Enabled
@@ -101,7 +103,7 @@ stages:
101103
value: Test
102104
pool:
103105
name: $(DncEngPublicBuildPool)
104-
demands: ImageOverride -equals $(WindowsMachineQueueName)
106+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
105107
timeoutInMinutes: 90
106108
strategy:
107109
maxParallel: 2
@@ -216,12 +218,8 @@ stages:
216218

217219
- job: WindowsLangVersionPreview
218220
pool:
219-
# The PR build definition sets this variable:
220-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
221-
# and there is an alternate build definition that sets this to a queue that is always scouting the
222-
# next preview of Visual Studio.
223221
name: $(DncEngPublicBuildPool)
224-
demands: ImageOverride -equals $(WindowsMachineQueueName)
222+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
225223
timeoutInMinutes: 120
226224
steps:
227225
- checkout: self
@@ -256,12 +254,8 @@ stages:
256254

257255
- job: WindowsNoRealsig_testCoreclr
258256
pool:
259-
# The PR build definition sets this variable:
260-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
261-
# and there is an alternate build definition that sets this to a queue that is always scouting the
262-
# next preview of Visual Studio.
263257
name: $(DncEngPublicBuildPool)
264-
demands: ImageOverride -equals $(WindowsMachineQueueName)
258+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
265259
timeoutInMinutes: 120
266260
steps:
267261
- checkout: self
@@ -306,12 +300,8 @@ stages:
306300

307301
- job: WindowsNoRealsig_testDesktop
308302
pool:
309-
# The PR build definition sets this variable:
310-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
311-
# and there is an alternate build definition that sets this to a queue that is always scouting the
312-
# next preview of Visual Studio.
313303
name: $(DncEngPublicBuildPool)
314-
demands: ImageOverride -equals $(WindowsMachineQueueName)
304+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
315305
timeoutInMinutes: 120
316306
strategy:
317307
parallel: 4
@@ -359,12 +349,8 @@ stages:
359349

360350
- job: WindowsStrictIndentation
361351
pool:
362-
# The PR build definition sets this variable:
363-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
364-
# and there is an alternate build definition that sets this to a queue that is always scouting the
365-
# next preview of Visual Studio.
366352
name: $(DncEngPublicBuildPool)
367-
demands: ImageOverride -equals $(WindowsMachineQueueName)
353+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
368354
timeoutInMinutes: 120
369355
steps:
370356
- checkout: self
@@ -400,7 +386,7 @@ stages:
400386
- job: WindowsNoStrictIndentation
401387
pool:
402388
name: $(DncEngPublicBuildPool)
403-
demands: ImageOverride -equals $(WindowsMachineQueueName)
389+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
404390
timeoutInMinutes: 120
405391
steps:
406392
- checkout: self
@@ -441,12 +427,8 @@ stages:
441427
- name: __VSNeverShowWhatsNew
442428
value: 1
443429
pool:
444-
# The PR build definition sets this variable:
445-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
446-
# and there is an alternate build definition that sets this to a queue that is always scouting the
447-
# next preview of Visual Studio.
448430
name: $(DncEngPublicBuildPool)
449-
demands: ImageOverride -equals $(WindowsMachineQueueName)
431+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
450432
timeoutInMinutes: 120
451433
strategy:
452434
matrix:
@@ -546,12 +528,8 @@ stages:
546528
- name: __VSNeverShowWhatsNew
547529
value: 1
548530
pool:
549-
# The PR build definition sets this variable:
550-
# WindowsMachineQueueName=Windows.vs2022.amd64.open
551-
# and there is an alternate build definition that sets this to a queue that is always scouting the
552-
# next preview of Visual Studio.
553531
name: $(DncEngPublicBuildPool)
554-
demands: ImageOverride -equals $(WindowsMachineQueueName)
532+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
555533
timeoutInMinutes: 120
556534
strategy:
557535
parallel: 4
@@ -622,7 +600,7 @@ stages:
622600
- job: MockOfficial
623601
pool:
624602
name: $(DncEngPublicBuildPool)
625-
demands: ImageOverride -equals $(WindowsMachineQueueName)
603+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
626604
steps:
627605
- checkout: self
628606
clean: true
@@ -721,7 +699,7 @@ stages:
721699
- job: EndToEndBuildTests
722700
pool:
723701
name: $(DncEngPublicBuildPool)
724-
demands: ImageOverride -equals $(WindowsMachineQueueName)
702+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
725703
strategy:
726704
maxParallel: 2
727705
matrix:
@@ -772,7 +750,7 @@ stages:
772750
- job: Plain_Build_Windows
773751
pool:
774752
name: $(DncEngPublicBuildPool)
775-
demands: ImageOverride -equals $(WindowsMachineQueueName)
753+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
776754
variables:
777755
- name: _BuildConfig
778756
value: Debug
@@ -827,7 +805,7 @@ stages:
827805
- job: Benchmarks
828806
pool:
829807
name: $(DncEngPublicBuildPool)
830-
demands: ImageOverride -equals $(WindowsMachineQueueName)
808+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
831809
variables:
832810
- name: _BuildConfig
833811
value: Release
@@ -843,7 +821,7 @@ stages:
843821
- job: Build_And_Test_AOT_Windows
844822
pool:
845823
name: $(DncEngPublicBuildPool)
846-
demands: ImageOverride -equals $(WindowsMachineQueueName)
824+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
847825
strategy:
848826
maxParallel: 2
849827
matrix:
@@ -884,7 +862,7 @@ stages:
884862
- job: ILVerify
885863
pool:
886864
name: $(DncEngPublicBuildPool)
887-
demands: ImageOverride -equals $(WindowsMachineQueueName)
865+
demands: ImageOverride -equals $(_WindowsMachineQueueName)
888866
steps:
889867
- checkout: self
890868
clean: true

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This file should be imported by eng/Versions.props
2727
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
2828
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
2929
<!-- dotnet/arcade dependencies -->
30-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25562.6</MicrosoftDotNetArcadeSdkPackageVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25569.5</MicrosoftDotNetArcadeSdkPackageVersion>
3131
<!-- _git/dotnet-optimization dependencies -->
3232
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
3333
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@
7676
</Dependency>
7777
</ProductDependencies>
7878
<ToolsetDependencies>
79-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25562.6">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25569.5">
8080
<Uri>https://github.com/dotnet/arcade</Uri>
81-
<Sha>4bb60deca10193c27f5bdf0a6afc5878ef558455</Sha>
81+
<Sha>d0dd6fd98074a55efc1bfe63297467c706058a56</Sha>
8282
</Dependency>
8383
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
8484
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<PropertyGroup>
1313
<!-- Don't use the built in support for pre-release iteration. The nuget repack task doesn't support
1414
the iteration format at the moment. https://github.com/dotnet/arcade/issues/15919 -->
15-
<FSharpPreReleaseIteration>1</FSharpPreReleaseIteration>
16-
<PreReleaseVersionLabel>alpha$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
15+
<FSharpPreReleaseIteration></FSharpPreReleaseIteration>
16+
<PreReleaseVersionLabel>servicing$(FSharpPreReleaseIteration)</PreReleaseVersionLabel>
1717
<!-- F# Version components -->
18-
<FSMajorVersion>11</FSMajorVersion>
18+
<FSMajorVersion>10</FSMajorVersion>
1919
<FSMinorVersion>0</FSMinorVersion>
20-
<FSBuildVersion>0</FSBuildVersion>
20+
<FSBuildVersion>200</FSBuildVersion>
2121
<FSRevisionVersion>0</FSRevisionVersion>
2222
<!-- -->
2323
<!-- F# Language version -->
@@ -28,26 +28,26 @@
2828
<FSCorePackageVersionValue>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCorePackageVersionValue>
2929
<FSCoreVersionPrefix>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSCoreVersionPrefix>
3030
<FSCoreVersion>$(FSMajorVersion).$(FSMinorVersion).0.0</FSCoreVersion>
31-
<FSCoreShippedVersion>10.0.0.0</FSCoreShippedVersion>
31+
<FSCoreShippedVersion>10.0.100.0</FSCoreShippedVersion>
3232
<!-- -->
3333
<!-- FSharp.Compiler.Service version -->
3434
<FCSMajorVersion>43</FCSMajorVersion>
35-
<FCSMinorVersion>10</FCSMinorVersion>
35+
<FCSMinorVersion>11</FCSMinorVersion>
3636
<FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion>
3737
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3838
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
3939
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
4040
<FSharpLibrariesChangelogVersion>$(FSMajorVersion).$(FSMinorVersion).$(FSBuildVersion)</FSharpLibrariesChangelogVersion>
4141
<!-- -->
4242
<!-- The current published nuget package -->
43-
<FSharpCoreShippedPackageVersionValue>9.0.303</FSharpCoreShippedPackageVersionValue>
43+
<FSharpCoreShippedPackageVersionValue>10.0.100</FSharpCoreShippedPackageVersionValue>
4444
<!-- -->
4545
<!-- The pattern for specifying the preview package -->
4646
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
4747
<!-- -->
4848
<!-- FSharp tools for Visual Studio version number -->
4949
<FSToolsMajorVersion>15</FSToolsMajorVersion>
50-
<FSToolsMinorVersion>0</FSToolsMinorVersion>
50+
<FSToolsMinorVersion>1</FSToolsMinorVersion>
5151
<FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion>
5252
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
5353
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
@@ -56,7 +56,7 @@
5656
<PropertyGroup>
5757
<!-- These have to be in sync with latest release branch -->
5858
<VSMajorVersion>18</VSMajorVersion>
59-
<VSMinorVersion>0</VSMinorVersion>
59+
<VSMinorVersion>3</VSMinorVersion>
6060
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6161
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6262
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ jobs:
122122

123123
# Populate internal runtime variables.
124124
- template: /eng/common/templates/steps/enable-internal-sources.yml
125-
parameters:
126-
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
125+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
126+
parameters:
127+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127128

128129
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129130

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
pool:
6161
${{ if eq(variables['System.TeamProject'], 'public') }}:
6262
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
63-
demands: ImageOverride -equals build.ubuntu.2004.amd64
63+
demands: ImageOverride -equals build.ubuntu.2204.amd64
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
6666
image: 1es-mariner-2

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,9 @@ stages:
305305
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
306306
is1ESPipeline: ${{ parameters.is1ESPipeline }}
307307

308-
- task: NuGetAuthenticate@1 # Populate internal runtime variables.
308+
- task: NuGetAuthenticate@1
309309

310+
# Populate internal runtime variables.
310311
- template: /eng/common/templates/steps/enable-internal-sources.yml
311312
parameters:
312313
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
"tools": {
1212
"dotnet": "10.0.100-rc.2.25502.107",
1313
"vs": {
14-
"version": "17.14",
14+
"version": "18.0",
1515
"components": [
1616
"Microsoft.VisualStudio.Component.FSharp"
1717
]
1818
},
19-
"xcopy-msbuild": "17.14.16"
19+
"xcopy-msbuild": "18.0.0"
2020
},
2121
"native-tools": {
2222
"perl": "5.38.2.2"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25562.6",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25569.5",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

0 commit comments

Comments
 (0)