Skip to content

Commit 44a24dc

Browse files
T-Groedgarfgpdotnet-maestro[bot]Smaug123abonie
authored
[automated] Merge branch 'main' => 'release/dev18.0' (#18711)
* More test for error recovery (#18669) * [main] Update dependencies from dnceng/internal/dotnet-optimization (#18683) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250610.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25310.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250611.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25311.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250616.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25316.1 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250617.1 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25309.1 -> To Version 1.0.0-prerelease.25317.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]> * [main] Update dependencies from dotnet/arcade (#18643) * Expand docstring on SynModuleDecl.Types (#18698) * Update dependencies from https://github.com/dotnet/arcade build 20250620.5 (#18703) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25316.2 -> To Version 10.0.0-beta.25320.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Remove feature/lsp merge from branch-merge.yml (#18705) Cleaning up, sicne we've merged feature/lsp to main some time ago * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250623.1 (#18710) optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25317.1 -> To Version 1.0.0-prerelease.25323.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20250623.3 (#18709) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25320.5 -> To Version 10.0.0-beta.25323.3 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Remove ActivityDisposable conditional directives and replace with System.IDisposable | null (#18707) --------- Co-authored-by: Edgar Gonzalez <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]> Co-authored-by: Patrick Stevens <[email protected]> Co-authored-by: Adam Boniecki <[email protected]> Co-authored-by: Copilot <[email protected]>
2 parents fc212af + e4d1f95 commit 44a24dc

30 files changed

+686
-175
lines changed

‎.github/workflows/branch-merge.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,3 @@ jobs:
1616
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
1717
with:
1818
configuration_file_path: '.config/service-branch-merge.json'
19-
feature-lsp-flow:
20-
uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
21-
with:
22-
configuration_file_path: '.config/feature-lsp-branch-merge.json'

‎azure-pipelines-PR.yml‎

Lines changed: 22 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,16 @@ stages:
113113
steps:
114114
- checkout: self
115115
clean: true
116+
# We first download a publicly available .NET SDK. That one has support for `path` in global.json. dotnet.cmd script can then download a version which is not yet shipped, but matches global.json.
116117
- task: UseDotNet@2
117118
displayName: install SDK
118119
inputs:
119120
packageType: sdk
120-
useGlobalJson: true
121+
version: '10.x'
121122
includePreviewVersions: true
122123
workingDirectory: $(Build.SourcesDirectory)
123124
installationPath: $(Build.SourcesDirectory)/.dotnet
125+
- script: .\eng\common\dotnet.cmd
124126
- script: .\eng\test-determinism.cmd -configuration Debug
125127
env:
126128
FSHARP_EXPERIMENTAL_FEATURES: $(_experimental_flag)
@@ -142,23 +144,16 @@ stages:
142144
clean: true
143145
- script: dotnet --list-sdks
144146
displayName: Report dotnet SDK versions
145-
- task: UseDotNet@2
146-
displayName: install SDK
147-
inputs:
148-
packageType: sdk
149-
useGlobalJson: true
150-
includePreviewVersions: true
151-
workingDirectory: $(Build.SourcesDirectory)
152-
installationPath: $(Agent.ToolsDirectory)/dotnet
153-
- script: dotnet tool restore
147+
148+
- script: ./eng/common/dotnet.sh tool restore
154149
env:
155150
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
156151
displayName: Install tools
157-
- script: dotnet fsi src/Compiler/FSCompCheck.fsx
152+
- script: ./eng/common/dotnet.sh fsi src/Compiler/FSCompCheck.fsx
158153
env:
159154
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
160155
displayName: Check error code sorting in src/Compiler/FSComp.txt
161-
- script: dotnet fantomas . --check
156+
- script: ./eng/common/dotnet.sh fantomas . --check
162157
env:
163158
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1
164159
displayName: Check code formatting (run 'dotnet fantomas .' to fix)
@@ -181,14 +176,16 @@ stages:
181176
steps:
182177
- checkout: self
183178
clean: true
179+
# We first download a publicly available .NET SDK. That one has support for `path` in global.json. dotnet.cmd script can then download a version which is not yet shipped, but matches global.json.
184180
- task: UseDotNet@2
185181
displayName: install SDK
186182
inputs:
187183
packageType: sdk
188-
useGlobalJson: true
184+
version: '10.x'
189185
includePreviewVersions: true
190186
workingDirectory: $(Build.SourcesDirectory)
191-
installationPath: $(Agent.ToolsDirectory)/dotnet
187+
installationPath: $(Build.SourcesDirectory)/.dotnet
188+
- script: ./eng/common/dotnet.sh
192189
- pwsh: ./check.ps1 -project $(_project)
193190
workingDirectory: $(Build.SourcesDirectory)/buildtools/checkpackages
194191
env:
@@ -769,15 +766,7 @@ stages:
769766
clean: true
770767
- script: dotnet --list-sdks
771768
displayName: Report dotnet SDK versions
772-
- task: UseDotNet@2
773-
displayName: install SDK
774-
inputs:
775-
packageType: sdk
776-
useGlobalJson: true
777-
includePreviewVersions: true
778-
workingDirectory: $(Build.SourcesDirectory)
779-
installationPath: $(Agent.ToolsDirectory)/dotnet
780-
- script: dotnet build .\FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
769+
- script: .\eng\common\dotnet.cmd build .\FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
781770
workingDirectory: $(Build.SourcesDirectory)
782771
displayName: Regular rebuild of FSharp.Compiler.Service.sln
783772
continueOnError: false
@@ -795,15 +784,7 @@ stages:
795784
clean: true
796785
- script: dotnet --list-sdks
797786
displayName: Report dotnet SDK versions
798-
- task: UseDotNet@2
799-
displayName: install SDK
800-
inputs:
801-
packageType: sdk
802-
useGlobalJson: true
803-
includePreviewVersions: true
804-
workingDirectory: $(Build.SourcesDirectory)
805-
installationPath: $(Agent.ToolsDirectory)/dotnet
806-
- script: dotnet build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
787+
- script: ./eng/common/dotnet.sh build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
807788
workingDirectory: $(Build.SourcesDirectory)
808789
displayName: Regular rebuild of FSharp.Compiler.Service.sln
809790
continueOnError: false
@@ -821,15 +802,7 @@ stages:
821802
clean: true
822803
- script: dotnet --list-sdks
823804
displayName: Report dotnet SDK versions
824-
- task: UseDotNet@2
825-
displayName: install SDK
826-
inputs:
827-
packageType: sdk
828-
useGlobalJson: true
829-
includePreviewVersions: true
830-
workingDirectory: $(Build.SourcesDirectory)
831-
installationPath: $(Agent.ToolsDirectory)/dotnet
832-
- script: dotnet build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
805+
- script: ./eng/common/dotnet.sh build ./FSharp.Compiler.Service.sln /bl:\"artifacts/log/$(_BuildConfig)/ServiceRegularBuild.binlog\"
833806
workingDirectory: $(Build.SourcesDirectory)
834807
displayName: Regular rebuild of FSharp.Compiler.Service.sln
835808
continueOnError: false
@@ -869,16 +842,16 @@ stages:
869842
steps:
870843
- checkout: self
871844
clean: true
845+
# We first download a publicly available .NET SDK. That one has support for `path` in global.json. dotnet.cmd script can then download a version which is not yet shipped, but matches global.json.
872846
- task: UseDotNet@2
873847
displayName: install SDK
874848
inputs:
875849
packageType: sdk
876-
useGlobalJson: true
850+
version: '10.x'
877851
includePreviewVersions: true
878852
workingDirectory: $(Build.SourcesDirectory)
879-
installationPath: $(Agent.ToolsDirectory)/dotnet
880-
- script: dotnet --list-sdks
881-
displayName: Report dotnet SDK versions
853+
installationPath: $(Build.SourcesDirectory)/.dotnet
854+
- script: .\eng\common\dotnet.cmd
882855
- script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig)
883856
env:
884857
NativeToolsOnMachine: true
@@ -900,14 +873,16 @@ stages:
900873
steps:
901874
- checkout: self
902875
clean: true
876+
# We first download a publicly available .NET SDK. That one has support for `path` in global.json. dotnet.cmd script can then download a version which is not yet shipped, but matches global.json.
903877
- task: UseDotNet@2
904878
displayName: install SDK
905879
inputs:
906880
packageType: sdk
907-
useGlobalJson: true
881+
version: '10.x'
908882
includePreviewVersions: true
909883
workingDirectory: $(Build.SourcesDirectory)
910-
installationPath: $(Agent.ToolsDirectory)/dotnet
884+
installationPath: $(Build.SourcesDirectory)/.dotnet
885+
- script: .\eng\common\dotnet.cmd
911886
- script: dotnet tool restore
912887
displayName: Restore dotnet tools
913888
- pwsh: .\tests\ILVerify\ilverify.ps1

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,29 +36,29 @@
3636
</Dependency>
3737
</ProductDependencies>
3838
<ToolsetDependencies>
39-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25271.2">
39+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25323.3">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>12d3a9f5d6138e22270694574e73e4c58a815795</Sha>
41+
<Sha>c9a95aeae77ee977969fa38ad73ed1d8dd96b93f</Sha>
4242
</Dependency>
43-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
43+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25323.1">
4444
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
45-
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
45+
<Sha>671d4f2460fa41be5135f5d5803c33ab926eb135</Sha>
4646
</Dependency>
47-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
47+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25323.1">
4848
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
49-
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
49+
<Sha>671d4f2460fa41be5135f5d5803c33ab926eb135</Sha>
5050
</Dependency>
51-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
51+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25323.1">
5252
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
53-
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
53+
<Sha>671d4f2460fa41be5135f5d5803c33ab926eb135</Sha>
5454
</Dependency>
55-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
55+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25323.1">
5656
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
57-
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
57+
<Sha>671d4f2460fa41be5135f5d5803c33ab926eb135</Sha>
5858
</Dependency>
59-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25309.1">
59+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25323.1">
6060
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
61-
<Sha>b1f3f5c40f86362217f1b98952d5c6562d609619</Sha>
61+
<Sha>671d4f2460fa41be5135f5d5803c33ab926eb135</Sha>
6262
</Dependency>
6363
</ToolsetDependencies>
6464
</Dependencies>

‎eng/Versions.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,10 +208,10 @@
208208
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
209209
<!-- -->
210210
<!-- MIBC profile packages -->
211-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntx64MIBCRuntimeVersion>
212-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntx86MIBCRuntimeVersion>
213-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
214-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationlinuxx64MIBCRuntimeVersion>
215-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25309.1</optimizationlinuxarm64MIBCRuntimeVersion>
211+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25323.1</optimizationwindows_ntx64MIBCRuntimeVersion>
212+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25323.1</optimizationwindows_ntx86MIBCRuntimeVersion>
213+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25323.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
214+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25323.1</optimizationlinuxx64MIBCRuntimeVersion>
215+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25323.1</optimizationlinuxarm64MIBCRuntimeVersion>
216216
</PropertyGroup>
217217
</Project>

‎eng/common/build.ps1‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Param(
2121
[switch] $publish,
2222
[switch] $clean,
2323
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
2425
[switch][Alias('bl')]$binaryLog,
2526
[switch][Alias('nobl')]$excludeCIBinarylog,
2627
[switch] $ci,
@@ -74,6 +75,7 @@ function Print-Usage() {
7475
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7576
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
7677
Write-Host " -buildCheck Sets /check msbuild parameter"
78+
Write-Host " -fromVMR Set when building from within the VMR"
7779
Write-Host ""
7880

7981
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -128,6 +130,7 @@ function Build {
128130
/p:Test=$test `
129131
/p:Pack=$pack `
130132
/p:DotNetBuild=$productBuild `
133+
/p:DotNetBuildFromVMR=$fromVMR `
131134
/p:IntegrationTest=$integrationTest `
132135
/p:PerformanceTest=$performanceTest `
133136
/p:Sign=$sign `

‎eng/common/build.sh‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ usage()
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
4545
echo " --buildCheck <value> Sets /check msbuild parameter"
46+
echo " --fromVMR Set when building from within the VMR"
4647
echo ""
4748
echo "Command line arguments not listed above are passed thru to msbuild."
4849
echo "Arguments can also be passed in with a single hyphen."
@@ -64,6 +65,7 @@ restore=false
6465
build=false
6566
source_build=false
6667
product_build=false
68+
from_vmr=false
6769
rebuild=false
6870
test=false
6971
integration_test=false
@@ -89,7 +91,7 @@ verbosity='minimal'
8991
runtime_source_feed=''
9092
runtime_source_feed_key=''
9193

92-
properties=''
94+
properties=()
9395
while [[ $# > 0 ]]; do
9496
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
9597
case "$opt" in
@@ -142,6 +144,9 @@ while [[ $# > 0 ]]; do
142144
restore=true
143145
pack=true
144146
;;
147+
-fromvmr|-from-vmr)
148+
from_vmr=true
149+
;;
145150
-test|-t)
146151
test=true
147152
;;
@@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do
187192
shift
188193
;;
189194
*)
190-
properties="$properties $1"
195+
properties+=("$1")
191196
;;
192197
esac
193198

@@ -221,7 +226,7 @@ function Build {
221226
InitializeCustomToolset
222227

223228
if [[ ! -z "$projects" ]]; then
224-
properties="$properties /p:Projects=$projects"
229+
properties+=("/p:Projects=$projects")
225230
fi
226231

227232
local bl=""
@@ -243,6 +248,7 @@ function Build {
243248
/p:Build=$build \
244249
/p:DotNetBuild=$product_build \
245250
/p:DotNetBuildSourceOnly=$source_build \
251+
/p:DotNetBuildFromVMR=$from_vmr \
246252
/p:Rebuild=$rebuild \
247253
/p:Test=$test \
248254
/p:Pack=$pack \
@@ -251,7 +257,7 @@ function Build {
251257
/p:Sign=$sign \
252258
/p:Publish=$publish \
253259
/p:RestoreStaticGraphEnableBinaryLogger=$binary_log \
254-
$properties
260+
${properties[@]+"${properties[@]}"}
255261

256262
ExitWithExitCode 0
257263
}

‎eng/common/core-templates/job/onelocbuild.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ jobs:
8686
isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
8787
${{ if eq(parameters.CreatePr, true) }}:
8888
isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }}
89-
${{ if eq(parameters.RepoType, 'gitHub') }}:
90-
isShouldReusePrSelected: ${{ parameters.ReusePr }}
89+
isShouldReusePrSelected: ${{ parameters.ReusePr }}
9190
packageSourceAuth: patAuth
9291
patVariable: ${{ parameters.CeapexPat }}
9392
${{ if eq(parameters.RepoType, 'gitHub') }}:
@@ -118,4 +117,4 @@ jobs:
118117
pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/'
119118
publishLocation: Container
120119
artifactName: Loc
121-
condition: ${{ parameters.condition }}
120+
condition: ${{ parameters.condition }}

0 commit comments

Comments
 (0)