Skip to content

Commit 1ee01b0

Browse files
committed
Revert "Update Microsoft.Build dependency for Dev17.5 (dotnet#16897)"
This reverts commit b25e8e0.
1 parent a537366 commit 1ee01b0

File tree

10 files changed

+8
-794
lines changed

10 files changed

+8
-794
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 & 776 deletions
This file was deleted.

azure-pipelines.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ stages:
142142
/p:PublishToSymbolServer=true
143143
/p:VisualStudioDropName=$(VisualStudioDropName)
144144
/p:GenerateSbom=true
145-
env:
146-
NativeToolsOnMachine: true
147145
- script: .\tests\EndToEndBuildTests\EndToEndBuildTests.cmd -c $(_BuildConfig)
148146
displayName: End to end build tests
149147
- task: PublishTestResults@2
@@ -343,8 +341,6 @@ stages:
343341
- checkout: self
344342
clean: true
345343
- script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind)
346-
env:
347-
NativeToolsOnMachine: true
348344
displayName: Build / Test
349345
- task: PublishTestResults@2
350346
displayName: Publish Test Results
@@ -403,8 +399,6 @@ stages:
403399
- checkout: self
404400
clean: true
405401
- script: eng\CIBuild.cmd -compressallmetadata -configuration $(_configuration) -$(_testKind)
406-
env:
407-
NativeToolsOnMachine: true
408402
displayName: Build / Test
409403
- task: PublishTestResults@2
410404
displayName: Publish Test Results

eng/Versions.props

Lines changed: 2 additions & 2 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>202</FSBuildVersion>
18+
<FSBuildVersion>201</FSBuildVersion>
1919
<FSRevisionVersion>0</FSRevisionVersion>
2020
<!-- -->
2121
<!-- F# Language version -->
@@ -102,7 +102,7 @@
102102
<MicrosoftVisualStudioShellPackagesVersion>17.5.0-preview-1-33020-520</MicrosoftVisualStudioShellPackagesVersion>
103103
<VisualStudioProjectSystemPackagesVersion>17.5.202-pre-g89e17c9f72</VisualStudioProjectSystemPackagesVersion>
104104
<MicrosoftVisualStudioThreadingPackagesVersion>17.4.27</MicrosoftVisualStudioThreadingPackagesVersion>
105-
<MicrosoftBuildOverallPackagesVersion>17.5.0</MicrosoftBuildOverallPackagesVersion>
105+
<MicrosoftBuildOverallPackagesVersion>17.4.0-preview-22469-04</MicrosoftBuildOverallPackagesVersion>
106106
<!-- Roslyn packages -->
107107
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
108108
<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.3.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.22554.2",

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)