Skip to content

Commit 86df629

Browse files
dotnet-botedgarfgpT-Grobrianrourkebollpsfinaki
authored
Merge release/dev17.11 to main (#17380)
Co-authored-by: Edgar Gonzalez <[email protected]> Co-authored-by: Tomas Grosup <[email protected]> Co-authored-by: Brian Rourke Boll <[email protected]> Co-authored-by: Petr <[email protected]> Co-authored-by: Kevin Ransom (msft) <[email protected]> Co-authored-by: Vlad Zarytovskii <[email protected]> Co-authored-by: vzarytovskii <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 5c6d8e7 commit 86df629

Some content is hidden

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

45 files changed

+362
-339
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44
<UsageData>
55
<IgnorePatterns>
66
<!-- Ignoring the known prebuilts. -->
7-
87
<!--
98
These will go away when repo updates targeting to net8.0
109
Tracked with https://github.com/dotnet/fsharp/issues/14765
1110
-->
1211
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.*" />
1312
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.*" />
1413
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.*" />
15-
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/7.0.0" />
16-
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/7.0.0" />
17-
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/7.0.0" />
14+
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0.0" />
15+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
16+
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0.0" />
17+
<UsagePattern IdentityGlob="System.CodeDom/8.0.0" />
18+
<UsagePattern IdentityGlob="System.Resources.Extensions/8.0.0" />
19+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0.0" />
1820

1921
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Runtime.linux-x64/8.0.*" />
2022
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/8.0.*" />
2123
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Runtime.linux-x64/8.0.*" />
2224

23-
2425
<!-- Tracked in https://github.com/dotnet/source-build/issues/3438 -->
2526
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
2627
</IgnorePatterns>

‎eng/Version.Details.xml‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,38 @@
77
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
88
</Dependency>
99
<!-- Intermediate is necessary for source build. -->
10-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.7.0-preview-23217-02">
10+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.0-preview-24178-03">
1111
<Uri>https://github.com/dotnet/msbuild</Uri>
12-
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
12+
<Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha>
1313
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
1414
</Dependency>
15-
<Dependency Name="Microsoft.Build" Version="17.7.0-preview-23217-02">
15+
<Dependency Name="Microsoft.Build" Version="17.11.0-preview-24178-03">
1616
<Uri>https://github.com/dotnet/msbuild</Uri>
17-
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
17+
<Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.Build.Framework" Version="17.7.0-preview-23217-02">
19+
<Dependency Name="Microsoft.Build.Framework" Version="17.11.0-preview-24178-03">
2020
<Uri>https://github.com/dotnet/msbuild</Uri>
21-
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
21+
<Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.7.0-preview-23217-02">
23+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="17.11.0-preview-24178-03">
2424
<Uri>https://github.com/dotnet/msbuild</Uri>
25-
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
25+
<Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.7.0-preview-23217-02">
27+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="17.11.0-preview-24178-03">
2828
<Uri>https://github.com/dotnet/msbuild</Uri>
29-
<Sha>2cbc8b6aef648cf21c6a68a0dab7fe09a614e475</Sha>
29+
<Sha>2d02daa886f279e2ee749cad03db4b1b75bb9adb</Sha>
30+
</Dependency>
31+
<Dependency Name="System.Reflection.Metadata" Version="8.0.0">
32+
<Uri>https://github.com/dotnet/runtime</Uri>
33+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
34+
</Dependency>
35+
<Dependency Name="System.Collections.Immutable" Version="8.0.0">
36+
<Uri>https://github.com/dotnet/runtime</Uri>
37+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
38+
</Dependency>
39+
<Dependency Name="System.Threading.Tasks.Dataflow" Version="8.0.0">
40+
<Uri>https://github.com/dotnet/runtime</Uri>
41+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
3042
</Dependency>
3143
</ProductDependencies>
3244
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,26 @@
7878
<!-- System.* packages -->
7979
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
8080
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
81+
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
8182
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
82-
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
83-
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
84-
<SystemDiagnosticsDiagnosticSourceVersion>7.0.2</SystemDiagnosticsDiagnosticSourceVersion>
83+
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
84+
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
85+
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
86+
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackageVersionVersion)</SystemDiagnosticsDiagnosticSourceVersion>
8587
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
8688
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
87-
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
88-
<SystemThreadingTasksDataflow>7.0.0</SystemThreadingTasksDataflow>
89+
<SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion>
8990
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
91+
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
9092
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
93+
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9194
<!-- Versions for package groups -->
92-
<RoslynVersion>4.6.0-3.23329.3</RoslynVersion>
93-
<VisualStudioEditorPackagesVersion>17.7.25-preview</VisualStudioEditorPackagesVersion>
94-
<MicrosoftVisualStudioShellPackagesVersion>17.7.35338-preview.1</MicrosoftVisualStudioShellPackagesVersion>
95-
<VisualStudioProjectSystemPackagesVersion>17.7.58-pre</VisualStudioProjectSystemPackagesVersion>
96-
<MicrosoftVisualStudioThreadingPackagesVersion>17.7.5-preview</MicrosoftVisualStudioThreadingPackagesVersion>
95+
<RoslynVersion>4.11.0-2.24264.2</RoslynVersion>
96+
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
97+
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
98+
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
99+
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
100+
<MicrosoftBuildVersion>17.11.0-preview-24178-03</MicrosoftBuildVersion>
97101
<!-- Roslyn packages -->
98102
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
99103
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -104,6 +108,7 @@
104108
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
105109
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
106110
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
111+
<!-- -->
107112
<!-- Visual Studio Shell packages -->
108113
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
109114
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
@@ -115,6 +120,7 @@
115120
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
116121
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
117122
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
123+
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
118124
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
119125
<MicrosoftVisualStudioManagedInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioManagedInterfacesVersion>
120126
<MicrosoftVisualStudioProjectAggregatorVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioProjectAggregatorVersion>
@@ -125,11 +131,12 @@
125131
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
126132
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
127133
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
134+
<!-- -->
128135
<!-- Microsoft Build packages -->
129-
<MicrosoftBuildVersion>17.7.0-preview-23217-02</MicrosoftBuildVersion>
130-
<MicrosoftBuildFrameworkVersion>17.7.0-preview-23217-02</MicrosoftBuildFrameworkVersion>
131-
<MicrosoftBuildTasksCoreVersion>17.7.0-preview-23217-02</MicrosoftBuildTasksCoreVersion>
132-
<MicrosoftBuildUtilitiesCoreVersion>17.7.0-preview-23217-02</MicrosoftBuildUtilitiesCoreVersion>
136+
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
137+
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
138+
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
139+
<!-- -->
133140
<!-- Visual Studio Editor packages -->
134141
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
135142
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
@@ -146,33 +153,36 @@
146153
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
147154
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
148155
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
156+
<!-- -->
149157
<!-- Visual Studio Threading packags -->
150158
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
159+
<!-- -->
151160
<!-- Visual Studio Project System packages-->
152161
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
153162
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
163+
<!-- -->
154164
<!-- Misc. Visual Studio packages -->
155165
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
156-
<MicrosoftVisualStudioRpcContractsVersion>17.7.3-preview</MicrosoftVisualStudioRpcContractsVersion>
166+
<MicrosoftVisualStudioRpcContractsVersion>17.10.21</MicrosoftVisualStudioRpcContractsVersion>
157167
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
158-
<MicrosoftVisualStudioValidationVersion>17.6.11</MicrosoftVisualStudioValidationVersion>
168+
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
159169
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
160170
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
161171
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
162172
<VSSDKVSLangProj11Version>11.0.4</VSSDKVSLangProj11Version>
163173
<VSSDKVSHelpVersion>7.0.4</VSSDKVSHelpVersion>
174+
<!-- -->
164175
<!-- setup packages -->
165176
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
166177
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
167178
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
179+
<!-- -->
168180
<!-- other packages -->
169181
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
170182
<FsCheckVersion>2.16.5</FsCheckVersion>
171183
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
172184
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
173-
<SystemComponentModelCompositionVersion>7.0.0</SystemComponentModelCompositionVersion>
174-
<SystemCompositionVersion>7.0.0</SystemCompositionVersion>
175-
<MicrosoftMSXMLVersion>8.0.0</MicrosoftMSXMLVersion>
185+
<MicrosoftMSXMLVersion>$(SystemPackageVersionVersion)</MicrosoftMSXMLVersion>
176186
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
177187
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
178188
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
@@ -184,12 +194,13 @@
184194
<NUnitLiteVersion>3.11.0</NUnitLiteVersion>
185195
<NunitXmlTestLoggerVersion>2.1.80</NunitXmlTestLoggerVersion>
186196
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
187-
<StreamJsonRpcVersion>2.16.8-preview</StreamJsonRpcVersion>
188-
<NerdbankStreamsVersion>2.9.112</NerdbankStreamsVersion>
197+
<StreamJsonRpcVersion>2.18.48</StreamJsonRpcVersion>
198+
<NerdbankStreamsVersion>2.10.69</NerdbankStreamsVersion>
189199
<XUnitVersion>2.4.1</XUnitVersion>
190200
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>
191201
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
192202
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
203+
<!-- -->
193204
<!-- MIBC profile packages -->
194205
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23614.4</optimizationwindows_ntx64MIBCRuntimeVersion>
195206
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23614.4</optimizationwindows_ntx86MIBCRuntimeVersion>

‎src/Compiler/Interactive/xlf/FSIstrings.txt.cs.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.de.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.es.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.fr.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.it.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.ja.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Compiler/Interactive/xlf/FSIstrings.txt.ko.xlf‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)