Skip to content

Commit 7738717

Browse files
KevinRansomKevinRansom
authored
Merge branch 'release/dev17.11' into merges/main-to-release/dev17.11
2 parents 075e884 + 2f906b9 commit 7738717

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

+314
-298
lines changed

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/8.0.2" />
1313
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Host.linux-x64/8.0.2" />
1414
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/8.0.2" />
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" />
15+
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0.0" />
16+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
17+
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0.0" />
18+
<UsagePattern IdentityGlob="System.CodeDom/8.0.0" />
19+
<UsagePattern IdentityGlob="System.Resources.Extensions/8.0.0" />
20+
21+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/8.0.0" />
1822

1923
<UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Runtime.linux-x64/8.0.2" />
2024
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/8.0.2" />

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@
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>
3030
</Dependency>
3131
</ProductDependencies>
3232
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 34 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,28 @@
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>
94+
<!-- -->
9195
<!-- 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>
96+
<RoslynVersion>4.11.0-2.24264.2</RoslynVersion>
97+
<VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
98+
<MicrosoftVisualStudioShellPackagesVersion>17.10.40152</MicrosoftVisualStudioShellPackagesVersion>
99+
<VisualStudioProjectSystemPackagesVersion>17.10.526-pre-g1b474069f5</VisualStudioProjectSystemPackagesVersion>
100+
<MicrosoftVisualStudioThreadingPackagesVersion>17.10.41</MicrosoftVisualStudioThreadingPackagesVersion>
101+
<MicrosoftBuildVersion>17.11.0-preview-24178-03</MicrosoftBuildVersion>
102+
<!-- -->
97103
<!-- Roslyn packages -->
98104
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
99105
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
@@ -104,6 +110,7 @@
104110
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
105111
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
106112
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
113+
<!-- -->
107114
<!-- Visual Studio Shell packages -->
108115
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
109116
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
@@ -115,6 +122,7 @@
115122
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
116123
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
117124
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
125+
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
118126
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
119127
<MicrosoftVisualStudioManagedInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioManagedInterfacesVersion>
120128
<MicrosoftVisualStudioProjectAggregatorVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioProjectAggregatorVersion>
@@ -125,11 +133,12 @@
125133
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
126134
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
127135
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
136+
<!-- -->
128137
<!-- 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>
138+
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
139+
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildTasksCoreVersion>
140+
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildVersion)</MicrosoftBuildUtilitiesCoreVersion>
141+
<!-- -->
133142
<!-- Visual Studio Editor packages -->
134143
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
135144
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
@@ -146,33 +155,36 @@
146155
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
147156
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
148157
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
158+
<!-- -->
149159
<!-- Visual Studio Threading packags -->
150160
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
161+
<!-- -->
151162
<!-- Visual Studio Project System packages-->
152163
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
153164
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
165+
<!-- -->
154166
<!-- Misc. Visual Studio packages -->
155167
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
156-
<MicrosoftVisualStudioRpcContractsVersion>17.7.3-preview</MicrosoftVisualStudioRpcContractsVersion>
168+
<MicrosoftVisualStudioRpcContractsVersion>17.10.21</MicrosoftVisualStudioRpcContractsVersion>
157169
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
158-
<MicrosoftVisualStudioValidationVersion>17.6.11</MicrosoftVisualStudioValidationVersion>
170+
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
159171
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
160172
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
161173
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
162174
<VSSDKVSLangProj11Version>11.0.4</VSSDKVSLangProj11Version>
163175
<VSSDKVSHelpVersion>7.0.4</VSSDKVSHelpVersion>
176+
<!-- -->
164177
<!-- setup packages -->
165178
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
166179
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
167180
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
181+
<!-- -->
168182
<!-- other packages -->
169183
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
170184
<FsCheckVersion>2.16.5</FsCheckVersion>
171185
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
172186
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
173-
<SystemComponentModelCompositionVersion>7.0.0</SystemComponentModelCompositionVersion>
174-
<SystemCompositionVersion>7.0.0</SystemCompositionVersion>
175-
<MicrosoftMSXMLVersion>8.0.0</MicrosoftMSXMLVersion>
187+
<MicrosoftMSXMLVersion>$(SystemPackageVersionVersion)</MicrosoftMSXMLVersion>
176188
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
177189
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
178190
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
@@ -184,12 +196,13 @@
184196
<NUnitLiteVersion>3.11.0</NUnitLiteVersion>
185197
<NunitXmlTestLoggerVersion>2.1.80</NunitXmlTestLoggerVersion>
186198
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
187-
<StreamJsonRpcVersion>2.16.8-preview</StreamJsonRpcVersion>
188-
<NerdbankStreamsVersion>2.9.112</NerdbankStreamsVersion>
199+
<StreamJsonRpcVersion>2.18.48</StreamJsonRpcVersion>
200+
<NerdbankStreamsVersion>2.10.69</NerdbankStreamsVersion>
189201
<XUnitVersion>2.4.1</XUnitVersion>
190202
<XUnitRunnerVersion>2.4.2</XUnitRunnerVersion>
191203
<FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
192204
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
205+
<!-- -->
193206
<!-- MIBC profile packages -->
194207
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23614.4</optimizationwindows_ntx64MIBCRuntimeVersion>
195208
<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)