Skip to content

Commit 426f5e0

Browse files
KevinRansomKevinRansom
committed
Fixify
1 parent 44498f1 commit 426f5e0

File tree

32 files changed

+131
-219
lines changed

32 files changed

+131
-219
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,6 @@ nCrunchTemp_*
123123
/tests/fsharp/core/members/set-only-property/fs.dll
124124
/tests/fsharp/core/members/set-only-property/cs.dll
125125

126-
.fake
126+
.fake
127+
*.pdb
128+
*.dll

‎VisualFSharp.sln‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PEVerify", "tests\fsharpqa\
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.PatternMatcher", "vsintegration\src\FSharp.PatternMatcher\FSharp.PatternMatcher.csproj", "{18227628-DF90-4C47-AF3D-CC72D2EDD986}"
130130
EndProject
131-
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "GetTypesVS.UnitTests", "vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj", "{6D93CEBD-4540-4D96-A153-B440A661FD09}"
132-
EndProject
133131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{6235B3AF-774D-4EA1-8F37-789E767F6368}"
134132
EndProject
135133
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FSharp.Compiler.MSBuild", "setup\Swix\Microsoft.FSharp.Compiler.MSBuild\Microsoft.FSharp.Compiler.MSBuild.csproj", "{4CBEE353-EB7F-4A47-988B-0070AEB4EE7A}"
@@ -768,18 +766,6 @@ Global
768766
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|Any CPU.Build.0 = Release|Any CPU
769767
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.ActiveCfg = Release|Any CPU
770768
{18227628-DF90-4C47-AF3D-CC72D2EDD986}.Release|x86.Build.0 = Release|Any CPU
771-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
772-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Debug|Any CPU.Build.0 = Debug|Any CPU
773-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Debug|x86.ActiveCfg = Debug|Any CPU
774-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Debug|x86.Build.0 = Debug|Any CPU
775-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Proto|Any CPU.ActiveCfg = Release|Any CPU
776-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Proto|Any CPU.Build.0 = Release|Any CPU
777-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Proto|x86.ActiveCfg = Release|Any CPU
778-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Proto|x86.Build.0 = Release|Any CPU
779-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Release|Any CPU.ActiveCfg = Release|Any CPU
780-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Release|Any CPU.Build.0 = Release|Any CPU
781-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Release|x86.ActiveCfg = Release|Any CPU
782-
{6D93CEBD-4540-4D96-A153-B440A661FD09}.Release|x86.Build.0 = Release|Any CPU
783769
{4CBEE353-EB7F-4A47-988B-0070AEB4EE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
784770
{4CBEE353-EB7F-4A47-988B-0070AEB4EE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
785771
{4CBEE353-EB7F-4A47-988B-0070AEB4EE7A}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -1078,7 +1064,6 @@ Global
10781064
{400FAB03-786E-40CC-85A8-04B0C2869B14} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10791065
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
10801066
{18227628-DF90-4C47-AF3D-CC72D2EDD986} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
1081-
{6D93CEBD-4540-4D96-A153-B440A661FD09} = {F7876C9B-FB6A-4EFB-B058-D6967DB75FB2}
10821067
{4CBEE353-EB7F-4A47-988B-0070AEB4EE7A} = {6235B3AF-774D-4EA1-8F37-789E767F6368}
10831068
{6BCFED7A-3F67-4180-B307-C7D69D191D8C} = {6235B3AF-774D-4EA1-8F37-789E767F6368}
10841069
{E93E7D28-1C6B-4E04-BE83-68428CF7E039} = {6235B3AF-774D-4EA1-8F37-789E767F6368}

‎azure-pipelines.yml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ stages:
9494
jobs:
9595
- job: Full_Signed
9696
pool:
97-
name: NetCore1ESPool-Svc-Internal
98-
demands: ImageOverride -equals build.windows.10.amd64.vs2019
97+
vmImage: $(MacOSMachineQueueName)
9998
timeoutInMinutes: 300
10099
variables:
101100
- group: DotNet-Blob-Feed
@@ -255,7 +254,8 @@ stages:
255254
# Mock official build
256255
- job: MockOfficial
257256
pool:
258-
vmImage: windows-latest
257+
name: NetCore1ESPool-Svc-Public
258+
demands: ImageOverride -equals $(WindowsMachineQueueName)
259259
steps:
260260
- checkout: self
261261
clean: true
@@ -265,7 +265,8 @@ stages:
265265
# Linux
266266
- job: Linux
267267
pool:
268-
vmImage: ubuntu-latest
268+
name: NetCore1ESPool-Svc-Public
269+
demands: ImageOverride -equals $(UbuntuMachineQueueName)
269270
variables:
270271
- name: _SignType
271272
value: Test
@@ -305,7 +306,7 @@ stages:
305306
# MacOS
306307
- job: MacOS
307308
pool:
308-
vmImage: macOS-latest
309+
vmImage: '$(MacOSMachineQueueName)'
309310
variables:
310311
- name: _SignType
311312
value: Test
@@ -345,7 +346,8 @@ stages:
345346
# End to end build
346347
- job: EndToEndBuildTests
347348
pool:
348-
vmImage: windows-latest
349+
name: NetCore1ESPool-Svc-Public
350+
demands: ImageOverride -equals $(WindowsMachineQueueName)
349351
steps:
350352
- checkout: self
351353
clean: true
@@ -360,7 +362,8 @@ stages:
360362
- name: _SignType
361363
value: Test
362364
pool:
363-
vmImage: windows-latest
365+
name: NetCore1ESPool-Svc-Public
366+
demands: ImageOverride -equals $(WindowsMachineQueueName)
364367
timeoutInMinutes: 90
365368
steps:
366369
- checkout: self
@@ -391,7 +394,8 @@ stages:
391394
# Plain build Windows
392395
- job: Plain_Build_Windows
393396
pool:
394-
vmImage: windows-latest
397+
name: NetCore1ESPool-Svc-Public
398+
demands: ImageOverride -equals $(WindowsMachineQueueName)
395399
variables:
396400
- name: _BuildConfig
397401
value: Debug
@@ -423,7 +427,8 @@ stages:
423427
# Plain build Linux
424428
- job: Plain_Build_Linux
425429
pool:
426-
vmImage: ubuntu-latest
430+
name: NetCore1ESPool-Svc-Public
431+
demands: ImageOverride -equals $(UbuntuMachineQueueName)
427432
variables:
428433
- name: _BuildConfig
429434
value: Debug
@@ -455,7 +460,7 @@ stages:
455460
# Plain build Mac
456461
- job: Plain_Build_MacOS
457462
pool:
458-
vmImage: macos-latest
463+
vmImage: '$(MacOSMachineQueueName)'
459464
variables:
460465
- name: _BuildConfig
461466
value: Debug

‎eng/Build.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,6 @@ try {
552552
}
553553

554554
if ($testVs -and -not $noVisualStudio) {
555-
TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\GetTypesVS.UnitTests\GetTypesVS.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\GetTypesVS.UnitTests"
556555
TestUsingNUnit -testProject "$RepoRoot\vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -targetFramework $desktopTargetFramework -testadapterpath "$ArtifactsDir\bin\VisualFSharp.UnitTests"
557556
}
558557

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<MicrosoftNETCoreAppRefVersion>3.1.0</MicrosoftNETCoreAppRefVersion>
208208
<MicrosoftNETCoreILDAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILDAsmVersion>
209209
<MicrosoftNETCoreILAsmVersion>5.0.0-preview.7.20364.11</MicrosoftNETCoreILAsmVersion>
210-
<MicrosoftNETTestSdkVersion>16.6.1</MicrosoftNETTestSdkVersion>
210+
<MicrosoftNETTestSdkVersion>17.1.0</MicrosoftNETTestSdkVersion>
211211
<MicrosoftWin32RegistryVersion>4.3.0</MicrosoftWin32RegistryVersion>
212212
<NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
213213
<NUnitVersion>3.13.2</NUnitVersion>

‎eng/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ BuildSolution
310310

311311
if [[ "$test_core_clr" == true ]]; then
312312
coreclrtestframework=net6.0
313-
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
313+
# TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj" --targetframework $coreclrtestframework --notestfilter
314314
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" --targetframework $coreclrtestframework --notestfilter
315315
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclrtestframework
316316
TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.Private.Scripting.UnitTests/FSharp.Compiler.Private.Scripting.UnitTests.fsproj" --targetframework $coreclrtestframework

‎src/fsharp/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs‎

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,27 +130,46 @@ module internal Utilities =
130130
sprintf "%s -restore %s %c%s%c /nologo /t:InteractivePackageManagement" prefix binLoggingArguments '\"' projectPath '\"'
131131

132132
let workingDir = Path.GetDirectoryName projectPath
133-
133+
let dotnetHostPath = getDotnetHostPath()
134+
let args = arguments "msbuild -v:quiet"
134135
let success, stdOut, stdErr =
135-
executeTool (getDotnetHostPath()) (arguments "msbuild -v:quiet") workingDir timeout
136+
executeTool dotnetHostPath args workingDir timeout
136137

137138
#if DEBUG
139+
let diagnostics =
140+
[|
141+
$"workingDir: {workingDir}"
142+
$"dotnetHostPath: {dotnetHostPath}"
143+
$"arguments: {args}"
144+
|]
145+
File.WriteAllLines(Path.Combine(workingDir, "build_CommandLine.txt"), diagnostics)
138146
File.WriteAllLines(Path.Combine(workingDir, "build_StandardOutput.txt"), stdOut)
139147
File.WriteAllLines(Path.Combine(workingDir, "build_StandardError.txt"), stdErr)
140148
#endif
141149

142150
let outputFile = projectPath + ".resolvedReferences.paths"
143151
let resolutionsFile = if success && File.Exists(outputFile) then Some outputFile else None
144-
{ success = success
145-
projectPath = projectPath
146-
stdOut = stdOut
147-
stdErr = stdErr
148-
resolutionsFile = resolutionsFile }
152+
{
153+
success = success
154+
projectPath = projectPath
155+
stdOut = stdOut
156+
stdErr = stdErr
157+
resolutionsFile = resolutionsFile
158+
}
149159

150160
let generateSourcesFromNugetConfigs scriptDirectory workingDir timeout =
161+
let dotnetHostPath = getDotnetHostPath()
162+
let args = "nuget list source --format short"
151163
let success, stdOut, stdErr =
152-
executeTool (getDotnetHostPath()) "nuget list source --format short" scriptDirectory timeout
164+
executeTool dotnetHostPath args scriptDirectory timeout
153165
#if DEBUG
166+
let diagnostics =
167+
[|
168+
$"scriptDirectory: {scriptDirectory}"
169+
$"dotnetHostPath: {dotnetHostPath}"
170+
$"arguments: {args}"
171+
|]
172+
File.WriteAllLines(Path.Combine(workingDir, "nuget_CommandLine.txt"), diagnostics)
154173
File.WriteAllLines(Path.Combine(workingDir, "nuget_StandardOutput.txt"), stdOut)
155174
File.WriteAllLines(Path.Combine(workingDir, "nuget_StandardError.txt"), stdErr)
156175
#else

‎tests/FSharp.Compiler.ComponentTests/FSharp.Compiler.ComponentTests.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
33
<Project Sdk="Microsoft.NET.Sdk">
4+
45
<PropertyGroup>
56
<TargetFrameworks>net472;net6.0</TargetFrameworks>
67
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net6.0</TargetFrameworks>

‎tests/FSharp.Test.Utilities/Utilities.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module Utilities =
107107
let systemConsoleRef = lazy AssemblyMetadata.CreateFromImage(NetCoreApp31Refs.System_Console ()).GetReference(display = "System.Console.dll (netcoreapp 3.1 ref)")
108108

109109
[<RequireQualifiedAccess>]
110-
module TargetFrameworkUtil =
110+
module public TargetFrameworkUtil =
111111

112112
let private config = TestFramework.initializeSuite ()
113113

‎tests/fsharp/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,4 @@ Library1.dll
1515
cd.tmp
1616
*.err
1717
*.vserr
18+
*.pdb

0 commit comments

Comments
 (0)