Skip to content

Commit 4ceab47

Browse files
majochamajocha
authored
Merge branch 'main' into async2
2 parents ba6c5a3 + 1695c5e commit 4ceab47

File tree

41 files changed

+385
-354
lines changed

Some content is hidden

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

41 files changed

+385
-354
lines changed

‎FSharp.sln‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.1.32113.165
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11104.47 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
77
EndProject
@@ -166,6 +166,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".VisualStudio", ".VisualStu
166166
docs\release-notes\.VisualStudio\17.9.md = docs\release-notes\.VisualStudio\17.9.md
167167
EndProjectSection
168168
EndProject
169+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{79E058E4-79E9-4178-AFA4-A87C45373379}"
170+
ProjectSection(SolutionItems) = preProject
171+
eng\Version.Details.props = eng\Version.Details.props
172+
eng\Version.Details.xml = eng\Version.Details.xml
173+
eng\Versions.props = eng\Versions.props
174+
EndProjectSection
175+
EndProject
169176
Global
170177
GlobalSection(SolutionConfigurationPlatforms) = preSolution
171178
Debug|Any CPU = Debug|Any CPU

‎docs/release-notes/.FSharp.Compiler.Service/11.0.0.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
### Fixed
2+
3+
* Scripts: Fix resolving the dotnet host path when an SDK directory is specified. ([PR #18960](https://github.com/dotnet/fsharp/pull/18960))
24
* Fix excessive StackGuard thread jumping ([PR #18971](https://github.com/dotnet/fsharp/pull/18971))
35

46
### Added
57

68
### Changed
79

8-
### Breaking Changes
10+
### Breaking Changes

‎eng/Version.Details.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/msbuild dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25507-05</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25507-05</MicrosoftBuildFrameworkPackageVersion>
11-
<MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25507-05</MicrosoftBuildTasksCorePackageVersion>
12-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25507-05</MicrosoftBuildUtilitiesCorePackageVersion>
9+
<MicrosoftBuildPackageVersion>18.1.0-preview-25509-03</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25509-03</MicrosoftBuildFrameworkPackageVersion>
11+
<MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25509-03</MicrosoftBuildTasksCorePackageVersion>
12+
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25509-03</MicrosoftBuildUtilitiesCorePackageVersion>
1313
<!-- dotnet/runtime dependencies -->
1414
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
1515
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
@@ -18,7 +18,7 @@ This file should be imported by eng/Versions.props
1818
<SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
1919
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
2020
<!-- dotnet/arcade dependencies -->
21-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25508.3</MicrosoftDotNetArcadeSdkPackageVersion>
21+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25509.1</MicrosoftDotNetArcadeSdkPackageVersion>
2222
<!-- _git/dotnet-optimization dependencies -->
2323
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
2424
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="d4a0a6c13e5c5b2faf06685125331de90a37943a" BarId="286004" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="64d877a07af8c020fe9da6e721bc2258894f31ee" BarId="286279" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25507-05">
5+
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25509-03">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
7-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
7+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25507-05">
9+
<Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25509-03">
1010
<Uri>https://github.com/dotnet/msbuild</Uri>
11-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
11+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25507-05">
13+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25509-03">
1414
<Uri>https://github.com/dotnet/msbuild</Uri>
15-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
15+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25507-05">
17+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25509-03">
1818
<Uri>https://github.com/dotnet/msbuild</Uri>
19-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
19+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
2020
</Dependency>
2121
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -42,11 +42,43 @@
4242
<Uri>https://github.com/dotnet/runtime</Uri>
4343
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
4444
</Dependency>
45+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
46+
<Uri>https://github.com/dotnet/roslyn</Uri>
47+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
48+
</Dependency>
49+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.25480.7">
50+
<Uri>https://github.com/dotnet/roslyn</Uri>
51+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
52+
</Dependency>
53+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25480.7">
54+
<Uri>https://github.com/dotnet/roslyn</Uri>
55+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
56+
</Dependency>
57+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25480.7">
58+
<Uri>https://github.com/dotnet/roslyn</Uri>
59+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
60+
</Dependency>
61+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25480.7">
62+
<Uri>https://github.com/dotnet/roslyn</Uri>
63+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
64+
</Dependency>
65+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25480.7">
66+
<Uri>https://github.com/dotnet/roslyn</Uri>
67+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
68+
</Dependency>
69+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.25480.7">
70+
<Uri>https://github.com/dotnet/roslyn</Uri>
71+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
72+
</Dependency>
73+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25480.7">
74+
<Uri>https://github.com/dotnet/roslyn</Uri>
75+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
76+
</Dependency>
4577
</ProductDependencies>
4678
<ToolsetDependencies>
47-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25508.3">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
4880
<Uri>https://github.com/dotnet/arcade</Uri>
49-
<Sha>41dda26a1806c552974e29d5ba476107ec0311a1</Sha>
81+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
5082
</Dependency>
5183
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
5284
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props‎

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -93,105 +93,77 @@
9393
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
9494
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>
9595
<!-- Versions for package groups -->
96-
<RoslynVersion>5.0.0-1.25276.102</RoslynVersion>
97-
<VisualStudioEditorPackagesVersion>17.14.188</VisualStudioEditorPackagesVersion>
98-
<MicrosoftVisualStudioShellPackagesVersion>17.14.40268</MicrosoftVisualStudioShellPackagesVersion>
99-
<VisualStudioProjectSystemPackagesVersion>17.14.79</VisualStudioProjectSystemPackagesVersion>
100-
<VisualStudioShellProjectsPackages>17.14.40254</VisualStudioShellProjectsPackages>
101-
<MicrosoftVisualStudioThreadingPackagesVersion>17.14.15</MicrosoftVisualStudioThreadingPackagesVersion>
96+
<VisualStudioEditorPackagesVersion>18.0.332-preview</VisualStudioEditorPackagesVersion>
97+
<MicrosoftVisualStudioShellPackagesVersion>18.0.2101-preview.1</MicrosoftVisualStudioShellPackagesVersion>
98+
<VisualStudioProjectSystemPackagesVersion>18.0.1237-pre</VisualStudioProjectSystemPackagesVersion>
99+
<VisualStudioShellProjectsPackages>18.0.2077-preview.1</VisualStudioShellProjectsPackages>
100+
<MicrosoftVisualStudioThreadingPackagesVersion>18.0.5</MicrosoftVisualStudioThreadingPackagesVersion>
101+
102102
<!-- Roslyn packages -->
103-
<MicrosoftCodeAnalysisFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisFeaturesVersion>
104-
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
105-
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
106-
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>5.0.0-1.25275.2</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
107-
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
108-
<MicrosoftCodeAnalysisVersion>$(RoslynVersion)</MicrosoftCodeAnalysisVersion>
109-
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
110-
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
103+
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
104+
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
105+
<MicrosoftCodeAnalysisVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisVersion>
106+
<MicrosoftCodeAnalysisCSharpVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpVersion>
107+
<MicrosoftVisualStudioLanguageServicesVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesVersion>
111108
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>
112-
<MicrosoftCodeAnalysisCompilersVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCompilersVersion>
109+
<!-- Roslyn for when we need to compile C# in tests. .dll hell caused by vstest makes newer version fail at runtime -->
110+
<RoslynForTestingButNotForVSLayer>4.14.0</RoslynForTestingButNotForVSLayer>
113111
<!-- -->
114112
<!-- Visual Studio Shell packages -->
115113
<MicrosoftVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioInteropVersion>
116-
<MicrosoftInternalVisualStudioInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioInteropVersion>
117114
<MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
118-
<MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
119115
<MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
120116
<MicrosoftVisualStudioTextManagerInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInteropVersion>
121117
<MicrosoftVisualStudioOLEInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioOLEInteropVersion>
122-
<MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
123118
<MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
124-
<MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
125119
<MicrosoftInternalVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftInternalVisualStudioShellFrameworkVersion>
126120
<MicrosoftVisualStudioPackageLanguageService150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioPackageLanguageService150Version>
127121
<MicrosoftVisualStudioManagedInterfacesVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioManagedInterfacesVersion>
128-
<MicrosoftVisualStudioProjectAggregatorVersion>$(VisualStudioShellProjectsPackages)</MicrosoftVisualStudioProjectAggregatorVersion>
129-
<MicrosoftVisualStudioGraphModelVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioGraphModelVersion>
130-
<MicrosoftVisualStudioImagingVersion>17.14.40270</MicrosoftVisualStudioImagingVersion>
131122
<MicrosoftVisualStudioDesignerInterfacesVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioDesignerInterfacesVersion>
132-
<MicrosoftVisualStudioUtilitiesVersion>17.14.40270</MicrosoftVisualStudioUtilitiesVersion>
133123
<MicrosoftVisualStudioShellImmutable100Version>10.0.30319</MicrosoftVisualStudioShellImmutable100Version>
134124
<MicrosoftVisualStudioShellImmutable110Version>11.0.50727</MicrosoftVisualStudioShellImmutable110Version>
135125
<MicrosoftVisualStudioShellImmutable150Version>15.0.25123-Dev15Preview</MicrosoftVisualStudioShellImmutable150Version>
126+
136127
<!-- -->
137128
<!-- Visual Studio Editor packages -->
138-
<MicrosoftVisualStudioCoreUtilityVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
139129
<MicrosoftVisualStudioEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
140130
<MicrosoftVisualStudioLanguageStandardClassificationVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
141-
<MicrosoftVisualStudioLanguageVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageVersion>
142131
<MicrosoftVisualStudioLanguageIntellisenseVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageIntellisenseVersion>
143132
<MicrosoftVisualStudioPlatformVSEditorVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioPlatformVSEditorVersion>
144-
<MicrosoftVisualStudioTextUIVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIVersion>
145133
<MicrosoftVisualStudioTextUIWpfVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
146-
<MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
147-
<MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>
148-
<MicrosoftVisualStudioComponentModelHostVersion>17.14.106</MicrosoftVisualStudioComponentModelHostVersion>
149134
<NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
150-
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.169-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
135+
<MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
151136
<MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
152-
<MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
153-
<!-- -->
154-
<!-- Visual Studio Threading packags -->
137+
138+
<!-- Visual Studio Threading packages -->
155139
<MicrosoftVisualStudioThreadingVersion>$(MicrosoftVisualStudioThreadingPackagesVersion)</MicrosoftVisualStudioThreadingVersion>
156-
<!-- -->
140+
157141
<!-- Visual Studio Project System packages-->
158142
<MicrosoftVisualStudioProjectSystemVersion>$(VisualStudioProjectSystemPackagesVersion)</MicrosoftVisualStudioProjectSystemVersion>
159143
<MicrosoftVisualStudioProjectSystemManagedVersion>2.3.6152103</MicrosoftVisualStudioProjectSystemManagedVersion>
160-
<!-- -->
144+
161145
<!-- Misc. Visual Studio packages -->
162-
<MicrosoftVSSDKBuildToolsVersion>17.10.2179</MicrosoftVSSDKBuildToolsVersion>
163-
<MicrosoftVisualStudioRpcContractsVersion>17.14.20</MicrosoftVisualStudioRpcContractsVersion>
146+
<MicrosoftVSSDKBuildToolsVersion>17.14.2120</MicrosoftVSSDKBuildToolsVersion>
164147
<MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>17.0.0</MicrosoftVisualFSharpMicrosoftVisualStudioShellUIInternalVersion>
165-
<MicrosoftVisualStudioValidationVersion>17.8.8</MicrosoftVisualStudioValidationVersion>
166-
<VSSDKDebuggerVisualizersVersion>12.0.4</VSSDKDebuggerVisualizersVersion>
167-
<VSSDKVSLangProjVersion>7.0.4</VSSDKVSLangProjVersion>
168-
<VSSDKVSLangProj8Version>8.0.4</VSSDKVSLangProj8Version>
169-
<VSSDKVSLangProj11Version>11.0.4</VSSDKVSLangProj11Version>
170-
<VSSDKVSHelpVersion>7.0.4</VSSDKVSHelpVersion>
171148
<!-- -->
172149
<!-- setup packages -->
173150
<MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
174151
<MicroBuildCoreSentinelVersion>1.0.0</MicroBuildCoreSentinelVersion>
175-
<MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
152+
<MicroBuildPluginsSwixBuildVersion>1.1.87</MicroBuildPluginsSwixBuildVersion>
176153
<!-- -->
177154
<!-- other packages -->
178155
<BenchmarkDotNetVersion>0.13.10</BenchmarkDotNetVersion>
179156
<FsCheckVersion>2.16.5</FsCheckVersion>
180-
<FSharpDataTypeProvidersVersion>4.3.0.0</FSharpDataTypeProvidersVersion>
181157
<MicrosoftCompositionVersion>1.0.31</MicrosoftCompositionVersion>
182158
<MicrosoftNetCompilersVersion>4.3.0-1.22220.8</MicrosoftNetCompilersVersion>
183-
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
159+
<!-- Making diff way too large, update separately later. e.g. to 6.0.0-rtm.21518.12 and 9.0.0-rc.2.24462.10 or via darc -->
184160
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
185161
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
186-
<MicrosoftNETTestSdkVersion>17.11.1</MicrosoftNETTestSdkVersion>
162+
<MicrosoftNETTestSdkVersion>17.14.1</MicrosoftNETTestSdkVersion>
187163
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
188-
<RoslynToolsSignToolVersion>1.0.0-beta2-dev3</RoslynToolsSignToolVersion>
189-
<StreamJsonRpcVersion>2.22.11</StreamJsonRpcVersion>
190-
<NerdbankStreamsVersion>2.12.87</NerdbankStreamsVersion>
191164
<XUnitVersion>2.9.0</XUnitVersion>
192-
<XUnitRunnerVersion>2.8.2</XUnitRunnerVersion>
165+
<XUnitRunnerVersion>3.1.4</XUnitRunnerVersion>
193166
<XunitXmlTestLoggerVersion>3.1.17</XunitXmlTestLoggerVersion>
194-
<HumanizerCoreVersion>2.2.0</HumanizerCoreVersion>
195167
<!-- -->
196168
</PropertyGroup>
197169
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"perl": "5.38.2.2"
2323
},
2424
"msbuild-sdks": {
25-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25508.3",
25+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25509.1",
2626
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
2727
}
2828
}

0 commit comments

Comments
 (0)