Skip to content

Commit 2bd23d4

Browse files
authored
Merge pull request #16925 from KevinRansom/update17.4
Revert 17.4
2 parents 870e1c9 + 539a6b2 commit 2bd23d4

File tree

10 files changed

+10
-759
lines changed

10 files changed

+10
-759
lines changed

NuGet.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
1414
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
1515
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
16-
<add key="nuget-build" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
1716
<add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
18-
<add key="vssdk-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk-archived/nuget/v3/index.json" />
1917
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
20-
<add key="vs-impl-archived" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl-archived/nuget/v3/index.json" />
21-
<add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
2218
</packageSources>
2319
<disabledPackageSources>
2420
<clear />

azure-pipelines-PR.yml

Lines changed: 0 additions & 739 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,6 @@ stages:
140140
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
141141
/p:PublishToSymbolServer=true
142142
/p:VisualStudioDropName=$(VisualStudioDropName)
143-
env:
144-
NativeToolsOnMachine: true
145143
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c $(_BuildConfig)
146144
displayName: End to end build tests
147145
- task: PublishTestResults@2
@@ -309,8 +307,6 @@ stages:
309307
- checkout: self
310308
clean: true
311309
- script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
312-
env:
313-
NativeToolsOnMachine: true
314310
displayName: Build / Test
315311
- task: PublishTestResults@2
316312
displayName: Publish Test Results
@@ -369,8 +365,6 @@ stages:
369365
- checkout: self
370366
clean: true
371367
- script: eng\CIBuild.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
372-
env:
373-
NativeToolsOnMachine: true
374368
displayName: Build / Test
375369
- task: PublishTestResults@2
376370
displayName: Publish Test Results

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- F# Version components -->
1616
<FSMajorVersion>7</FSMajorVersion>
1717
<FSMinorVersion>0</FSMinorVersion>
18-
<FSBuildVersion>1</FSBuildVersion>
18+
<FSBuildVersion>0</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->
@@ -33,7 +33,7 @@
3333
<!-- FSharp.Compiler.Service version -->
3434
<FCSMajorVersion>42</FCSMajorVersion>
3535
<FCSMinorVersion>7</FCSMinorVersion>
36-
<FCSBuildVersion>102</FCSBuildVersion>
36+
<FCSBuildVersion>101</FCSBuildVersion>
3737
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3838
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
3939
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
@@ -48,7 +48,7 @@
4848
<!-- FSharp tools for Visual Studio version number -->
4949
<FSToolsMajorVersion>12</FSToolsMajorVersion>
5050
<FSToolsMinorVersion>4</FSToolsMinorVersion>
51-
<FSToolsBuildVersion>1</FSToolsBuildVersion>
51+
<FSToolsBuildVersion>0</FSToolsBuildVersion>
5252
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
5353
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
5454
<FSProductVersionReleaseNotesVersion>$(FSToolsMajorVersion)-$(FSToolsMinorVersion)-$(FSToolsBuildVersion)</FSProductVersionReleaseNotesVersion>
@@ -100,7 +100,7 @@
100100
<MicrosoftVisualStudioShellPackagesVersion>17.4.0-preview-3-32916-145</MicrosoftVisualStudioShellPackagesVersion>
101101
<VisualStudioProjectSystemPackagesVersion>17.4.342-pre</VisualStudioProjectSystemPackagesVersion>
102102
<MicrosoftVisualStudioThreadingPackagesVersion>17.4.23-alpha</MicrosoftVisualStudioThreadingPackagesVersion>
103-
<MicrosoftBuildOverallPackagesVersion>17.4.6</MicrosoftBuildOverallPackagesVersion>
103+
<MicrosoftBuildOverallPackagesVersion>17.4.0</MicrosoftBuildOverallPackagesVersion>
104104
<!-- Roslyn packages -->
105105
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
106106
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"xcopy-msbuild": "17.2.1"
1616
},
1717
"native-tools": {
18-
"perl": "5.38.0.1"
18+
"perl": "5.32.1.1"
1919
},
2020
"msbuild-sdks": {
2121
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22524.5",

tests/fsharp/core/printing/output.1000.stdout.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2765,7 +2765,7 @@ val ShortName: string = "hi"
27652765
> val list2: int list = [1]
27662766

27672767
module FSI_0317.
2768-
1b7a9d320091d10fbac9691c10ee13bed243d3b01c7fe995d7b24c6c073f5ea7
2768+
C6f6ae524efb4d95b2b2eaa363022f9d4a28c777f788498ca81a55b9ec1aad1a
27692769

27702770
{"ImmutableField0":6}
27712771
type R1 =

tests/fsharp/core/printing/output.200.stdout.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2010,7 +2010,7 @@ val ShortName: string = "hi"
20102010
> val list2: int list = [1]
20112011

20122012
module FSI_0317.
2013-
1b7a9d320091d10fbac9691c10ee13bed243d3b01c7fe995d7b24c6c073f5ea7
2013+
C6f6ae524efb4d95b2b2eaa363022f9d4a28c777f788498ca81a55b9ec1aad1a
20142014

20152015
{"ImmutableField0":6}
20162016
type R1 =

tests/fsharp/core/printing/output.multiemit.stdout.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6312,7 +6312,7 @@ val ShortName: string = "hi"
63126312
> val list2: int list = [1]
63136313

63146314
module FSI_0316.
6315-
1b7a9d320091d10fbac9691c10ee13bed243d3b01c7fe995d7b24c6c073f5ea7
6315+
C6f6ae524efb4d95b2b2eaa363022f9d4a28c777f788498ca81a55b9ec1aad1a
63166316

63176317
{"ImmutableField0":6}
63186318
type R1 =

tests/fsharp/core/printing/output.off.stdout.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1779,7 +1779,7 @@ val ShortName: string = "hi"
17791779
> val list2: int list
17801780

17811781
module FSI_0317.
1782-
1b7a9d320091d10fbac9691c10ee13bed243d3b01c7fe995d7b24c6c073f5ea7
1782+
C6f6ae524efb4d95b2b2eaa363022f9d4a28c777f788498ca81a55b9ec1aad1a
17831783

17841784
{"ImmutableField0":6}
17851785
type R1 =

tests/fsharp/core/printing/output.stdout.bsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6312,7 +6312,7 @@ val ShortName: string = "hi"
63126312
> val list2: int list = [1]
63136313

63146314
module FSI_0316.
6315-
1b7a9d320091d10fbac9691c10ee13bed243d3b01c7fe995d7b24c6c073f5ea7
6315+
C6f6ae524efb4d95b2b2eaa363022f9d4a28c777f788498ca81a55b9ec1aad1a
63166316

63176317
{"ImmutableField0":6}
63186318
type R1 =

0 commit comments

Comments
 (0)