Skip to content

Commit 9d84a7a

Browse files
KevinRansomKevinRansom
authored
Merge branch 'release/dev17.4' into merges/main-to-release/dev17.4
2 parents 0063f20 + 4ea0cae commit 9d84a7a

14 files changed

+23
-589
lines changed

‎azure-pipelines.yml

+11-10
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ stages:
8484
# Signed build #
8585
#-------------------------------------------------------------------------------------------------------------------#
8686
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
87-
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.3') }}:
87+
- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.4') }}:
8888
- template: /eng/common/templates/job/onelocbuild.yml
8989
parameters:
9090
MirrorRepo: fsharp
91-
MirrorBranch: release/dev17.3
91+
MirrorBranch: release/dev17.4
9292
LclSource: lclFilesfromPackage
9393
LclPackageId: 'LCL-JUNO-PROD-FSHARP'
9494
- template: /eng/common/templates/jobs/jobs.yml
@@ -104,7 +104,7 @@ stages:
104104
jobs:
105105
- job: Full_Signed
106106
pool:
107-
name: NetCore1ESPool-Internal
107+
name: NetCore1ESPool-Svc-Internal
108108
demands: ImageOverride -equals windows.vs2022.amd64
109109
timeoutInMinutes: 300
110110
variables:
@@ -210,7 +210,7 @@ stages:
210210
- name: _SignType
211211
value: Test
212212
pool:
213-
name: NetCore1ESPool-Public
213+
name: NetCore1ESPool-Svc-Public
214214
demands: ImageOverride -equals $(WindowsMachineQueueName)
215215
timeoutInMinutes: 90
216216
steps:
@@ -283,7 +283,7 @@ stages:
283283
# WindowsMachineQueueName=Windows.vs2022.amd64.open
284284
# and there is an alternate build definition that sets this to a queue that is always scouting the
285285
# next preview of Visual Studio.
286-
name: NetCore1ESPool-Public
286+
name: NetCore1ESPool-Svc-Public
287287
demands: ImageOverride -equals $(WindowsMachineQueueName)
288288
timeoutInMinutes: 120
289289
strategy:
@@ -395,7 +395,7 @@ stages:
395395
# Mock official build
396396
- job: MockOfficial
397397
pool:
398-
name: NetCore1ESPool-Public
398+
name: NetCore1ESPool-Svc-Public
399399
demands: ImageOverride -equals $(WindowsMachineQueueName)
400400
steps:
401401
- checkout: self
@@ -486,7 +486,7 @@ stages:
486486
# End to end build
487487
- job: EndToEndBuildTests
488488
pool:
489-
name: NetCore1ESPool-Public
489+
name: NetCore1ESPool-Svc-Public
490490
demands: ImageOverride -equals $(WindowsMachineQueueName)
491491
steps:
492492
- checkout: self
@@ -511,7 +511,7 @@ stages:
511511
# Plain build Windows
512512
- job: Plain_Build_Windows
513513
pool:
514-
name: NetCore1ESPool-Public
514+
name: NetCore1ESPool-Svc-Public
515515
demands: ImageOverride -equals $(WindowsMachineQueueName)
516516
variables:
517517
- name: _BuildConfig
@@ -653,8 +653,9 @@ stages:
653653
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
654654
- template: eng/release/insert-into-vs.yml
655655
parameters:
656-
componentBranchName: refs/heads/release/dev17.3
657-
insertTargetBranch: rel/d17.3
656+
componentBranchName: refs/heads/release/dev17.4
657+
insertTargetBranch: main
658+
658659
insertTeamEmail: fsharpteam@microsoft.com
659660
insertTeamName: 'F#'
660661
completeInsertion: 'auto'

‎eng/Versions.props

+4-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<VSMajorVersion>17</VSMajorVersion>
59-
<VSMinorVersion>3</VSMinorVersion>
59+
60+
<VSMinorVersion>4</VSMinorVersion>
61+
6062
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6163
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6264
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -125,7 +127,7 @@
125127
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
126128
<MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
127129
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
128-
<MicrosoftCodeAnalysisWorkspacesCommonVersion>$(RoslynVersion)</MicrosoftCodeAnalysisWorkspacesCommonVersion>
130+
<MicrosoftCodeAnalysisVersion>$(RoslynVersion)</MicrosoftCodeAnalysisVersion>
129131
<MicrosoftCodeAnalysisCSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisCSharpVersion>
130132
<MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
131133
<MicrosoftCodeAnalysisTestResourcesProprietaryVersion>2.0.28</MicrosoftCodeAnalysisTestResourcesProprietaryVersion>

‎eng/release/insert-into-vs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ stages:
1414
jobs:
1515
- job: Insert_VS
1616
pool:
17-
name: NetCore1ESPool-Internal
17+
name: NetCore1ESPool-Svc-Internal
1818
demands: ImageOverride -equals windows.vs2019.amd64
1919
variables:
2020
- group: DotNet-VSTS-Infra-Access

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"Microsoft.VisualStudio.Component.FSharp"
1313
]
1414
},
15-
"xcopy-msbuild": "17.1.0"
15+
"xcopy-msbuild": "17.2.1"
1616
},
1717
"native-tools": {
1818
"perl": "5.32.1.1"

‎tests/FSharp.Test.Utilities/FSharp.Test.Utilities.fsproj

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
</PackageReference>
6161
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
6262
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
63-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" />
6463
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
6564
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />
6665
<PackageReference Include="Microsoft.NETCore.App.Ref" Version="6.0.0" IncludeAssets="none" PrivateAssets="all" GeneratePathProperty="true" />

‎tests/fsharp/FSharpSuite.Tests.fsproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@
106106
<ProjectReference Include="$(FSharpSourcesRoot)\Compiler\FSharp.Compiler.Service.fsproj" />
107107
<ProjectReference Include="$(FSharpSourcesRoot)\FSharp.Core\FSharp.Core.fsproj" />
108108
<ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
109-
<ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\shims\shims.csproj"
110-
Condition="'$(TargetFramework)' == 'net472'">
109+
<ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\shims\shims.csproj" Condition="'$(TargetFramework)' == 'net472'">
111110
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
112111
</ProjectReference>
113112
</ItemGroup>
@@ -120,7 +119,6 @@
120119
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
121120
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
122121
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
123-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" />
124122
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
125123
<PackageReference Include="Microsoft.CodeAnalysis.Test.Resources.Proprietary" Version="$(MicrosoftCodeAnalysisTestResourcesProprietaryVersion)" />
126124
</ItemGroup>

‎vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

-2
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,9 @@
152152
<ItemGroup>
153153
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
154154
<PackageReference Include="Microsoft.Internal.VisualStudio.Interop" Version="$(MicrosoftInternalVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
155-
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
156155
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
157156
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(MicrosoftCodeAnalysisEditorFeaturesWpfVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
158157
<PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="$(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
159-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
160158
<PackageReference Include="Microsoft.Composition" Version="$(MicrosoftCompositionVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
161159
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
162160
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

‎vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj

-2
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858

5959
<ItemGroup>
6060
<PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
61-
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6261
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
63-
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisWorkspacesCommonVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6462
<PackageReference Include="Microsoft.Composition" Version="$(MicrosoftCompositionVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6563
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />
6664
<PackageReference Include="Microsoft.VisualStudio.Designer.Interfaces" Version="$(MicrosoftVisualStudioDesignerInterfacesVersion)" PrivateAssets="all" ExcludeAssets="runtime;contentFiles;build;analyzers;native" />

‎vsintegration/src/FSharp.PatternMatcher/BKTree.Builder.cs

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
22

3+
using Microsoft.CodeAnalysis;
34
using Microsoft.CodeAnalysis.Utilities;
45
using System;
56
using System.Collections.Generic;

0 commit comments

Comments
 (0)