Skip to content

Commit dd7b1ea

Browse files
safesparrowsafesparrow
committed
Cleanup
1 parent 716db8e commit dd7b1ea

File tree

3 files changed

+52
-49
lines changed

3 files changed

+52
-49
lines changed

‎tests/ParallelTypeCheckingTests/Tests/ComponentTests.args.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
-o:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.dll
1+
-o:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.dll
22
-g
33
--debug:portable
4-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\buildproperties.fs
5-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.AssemblyInfo.fs
6-
--sourcelink:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.sourcelink.json
4+
--embed:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\buildproperties.fs
5+
--embed:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.AssemblyInfo.fs
6+
--sourcelink:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.sourcelink.json
77
--langversion:Preview
88
--noframework
99
--define:TRACE
@@ -25,18 +25,18 @@
2525
--define:NETCOREAPP2_2_OR_GREATER
2626
--define:NETCOREAPP3_0_OR_GREATER
2727
--define:NETCOREAPP3_1_OR_GREATER
28-
--doc:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.xml
28+
--doc:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.xml
2929
--keyfile:$PACKAGES$\microsoft.dotnet.arcade.sdk\8.0.0-beta.22552.1\tools\snk/MSFT.snk
3030
--publicsign+
3131
--optimize-
3232
--tailcalls-
3333
-r:$PACKAGES$\fluentassertions\5.10.3\lib\netcoreapp2.1\FluentAssertions.dll
34-
-r:$CODE_ROOT$\artifacts\bin\FSharp.Build\Debug\netstandard2.0\FSharp.Build.dll
35-
-r:$CODE_ROOT$\artifacts\bin\FSharp.Compiler.Interactive.Settings\Debug\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll
36-
-r:$CODE_ROOT$\artifacts\bin\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.dll
37-
-r:$CODE_ROOT$\artifacts\bin\FSharp.Core\Debug\netstandard2.1\FSharp.Core.dll
38-
-r:$CODE_ROOT$\artifacts\bin\FSharp.DependencyManager.Nuget\Debug\netstandard2.0\FSharp.DependencyManager.Nuget.dll
39-
-r:$CODE_ROOT$\artifacts\obj\FSharp.Test.Utilities\Debug\net7.0\ref\FSharp.Test.Utilities.dll
34+
-r:..\..\artifacts\bin\FSharp.Build\Debug\netstandard2.0\FSharp.Build.dll
35+
-r:..\..\artifacts\bin\FSharp.Compiler.Interactive.Settings\Debug\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll
36+
-r:..\..\artifacts\bin\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.dll
37+
-r:..\..\artifacts\bin\FSharp.Core\Debug\netstandard2.1\FSharp.Core.dll
38+
-r:..\..\artifacts\bin\FSharp.DependencyManager.Nuget\Debug\netstandard2.0\FSharp.DependencyManager.Nuget.dll
39+
-r:..\..\artifacts\obj\FSharp.Test.Utilities\Debug\net7.0\ref\FSharp.Test.Utilities.dll
4040
-r:$PACKAGES$\microsoft.build.framework\17.4.0-preview-22469-04\ref\net7.0\Microsoft.Build.Framework.dll
4141
-r:$PACKAGES$\microsoft.build.tasks.core\17.4.0-preview-22469-04\ref\net7.0\Microsoft.Build.Tasks.Core.dll
4242
-r:$PACKAGES$\microsoft.build.utilities.core\17.4.0-preview-22469-04\ref\net7.0\Microsoft.Build.Utilities.Core.dll
@@ -249,10 +249,10 @@
249249
--nowarn:75
250250
--warnon:1182
251251
--simpleresolution
252-
--refout:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\refint\FSharp.Compiler.ComponentTests.dll
253-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\buildproperties.fs
254-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.fs
255-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.AssemblyInfo.fs
252+
--refout:..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\refint\FSharp.Compiler.ComponentTests.dll
253+
..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\buildproperties.fs
254+
..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\.NETCoreApp,Version=v7.0.AssemblyAttributes.fs
255+
..\..\artifacts\obj\FSharp.Compiler.ComponentTests\Debug\net7.0\FSharp.Compiler.ComponentTests.AssemblyInfo.fs
256256
..\service\FsUnit.fs
257257
Conformance\BasicGrammarElements\OperatorNames\OperatorNames.fs
258258
Conformance\BasicGrammarElements\PrecedenceAndOperators\PrecedenceAndOperators.fs

‎tests/ParallelTypeCheckingTests/Tests/FCS.args.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
-o:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.dll
1+
-o:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.dll
22
-g
33
--debug:embedded
4-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.fs
5-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.fs
6-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.fs
7-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\buildproperties.fs
8-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.AssemblyInfo.fs
9-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\illex.fs
10-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pplex.fs
11-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\lex.fs
12-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\ilpars.fs
13-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pppars.fs
14-
--embed:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pars.fs
15-
--sourcelink:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.sourcelink.json
4+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.fs
5+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.fs
6+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.fs
7+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\buildproperties.fs
8+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.AssemblyInfo.fs
9+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\illex.fs
10+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pplex.fs
11+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\lex.fs
12+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\ilpars.fs
13+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pppars.fs
14+
--embed:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pars.fs
15+
--sourcelink:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.sourcelink.json
1616
--noframework
1717
--define:TRACE
1818
--define:COMPILER
@@ -30,16 +30,16 @@
3030
--define:NETSTANDARD1_5_OR_GREATER
3131
--define:NETSTANDARD1_6_OR_GREATER
3232
--define:NETSTANDARD2_0_OR_GREATER
33-
--doc:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.xml
33+
--doc:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.xml
3434
--keyfile:$PACKAGES$\microsoft.dotnet.arcade.sdk\8.0.0-beta.22552.1\tools\snk/MSFT.snk
3535
--publicsign+
3636
--optimize-
37-
--resource:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.resources
38-
--resource:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.resources
39-
--resource:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.resources
40-
--resource:$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSStrings.resources
41-
-r:$CODE_ROOT$\artifacts\bin\FSharp.Core\Debug\netstandard2.0\FSharp.Core.dll
42-
-r:$CODE_ROOT$\artifacts\bin\FSharp.DependencyManager.Nuget\Debug\netstandard2.0\FSharp.DependencyManager.Nuget.dll
37+
--resource:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.resources
38+
--resource:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.resources
39+
--resource:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.resources
40+
--resource:..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSStrings.resources
41+
-r:..\..\artifacts\bin\FSharp.Core\Debug\netstandard2.0\FSharp.Core.dll
42+
-r:..\..\artifacts\bin\FSharp.DependencyManager.Nuget\Debug\netstandard2.0\FSharp.DependencyManager.Nuget.dll
4343
-r:$PACKAGES$\microsoft.build.framework\17.4.0-preview-22469-04\ref\netstandard2.0\Microsoft.Build.Framework.dll
4444
-r:$PACKAGES$\microsoft.build.tasks.core\17.4.0-preview-22469-04\ref\netstandard2.0\Microsoft.Build.Tasks.Core.dll
4545
-r:$PACKAGES$\microsoft.build.utilities.core\17.4.0-preview-22469-04\ref\netstandard2.0\Microsoft.Build.Utilities.Core.dll
@@ -198,13 +198,13 @@
198198
--warnon:3218
199199
--warnon:3390
200200
--simpleresolution
201-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.fs
202-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.fs
203-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.fs
204-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\buildproperties.fs
205-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.InternalsVisibleTo.fs
206-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\.NETStandard,Version=v2.0.AssemblyAttributes.fs
207-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.AssemblyInfo.fs
201+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSComp.fs
202+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSIstrings.fs
203+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\UtilsStrings.fs
204+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\buildproperties.fs
205+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.InternalsVisibleTo.fs
206+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\.NETStandard,Version=v2.0.AssemblyAttributes.fs
207+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\FSharp.Compiler.Service.AssemblyInfo.fs
208208
Utilities\sformat.fsi
209209
Utilities\sformat.fs
210210
Utilities\sr.fsi
@@ -274,8 +274,8 @@ AbstractIL\ilx.fsi
274274
AbstractIL\ilx.fs
275275
AbstractIL\ilascii.fsi
276276
AbstractIL\ilascii.fs
277-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\ilpars.fs
278-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\illex.fs
277+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\ilpars.fs
278+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\illex.fs
279279
AbstractIL\ilprint.fsi
280280
AbstractIL\ilprint.fs
281281
AbstractIL\ilmorph.fsi
@@ -310,12 +310,12 @@ SyntaxTree\SyntaxTreeOps.fsi
310310
SyntaxTree\SyntaxTreeOps.fs
311311
SyntaxTree\ParseHelpers.fsi
312312
SyntaxTree\ParseHelpers.fs
313-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pppars.fs
314-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pars.fs
313+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pppars.fs
314+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pars.fs
315315
SyntaxTree\LexHelpers.fsi
316316
SyntaxTree\LexHelpers.fs
317-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pplex.fs
318-
$CODE_ROOT$\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\\lex.fs
317+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\pplex.fs
318+
..\..\artifacts\obj\FSharp.Compiler.Service\Debug\netstandard2.0\\lex.fs
319319
SyntaxTree\LexFilter.fsi
320320
SyntaxTree\LexFilter.fs
321321
TypedTree\tainted.fsi

‎tests/ParallelTypeCheckingTests/Tests/Utils.fs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ let CodeRoot =
1515
@$"{__SOURCE_DIRECTORY__}\.checkouts\fcs"
1616
let replaceCodeRoot (s : string) = s.Replace("$CODE_ROOT$", CodeRoot)
1717
let packages =
18-
let pathWithEnv = @"%USERPROFILE%\.nuget\packages"
18+
// Here we assume that the NuGet packages are located in a certain user folder,
19+
// and that the projects being compiled use that global package cache
20+
let userprofile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)
21+
let pathWithEnv = $@"{userprofile}\.nuget\packages"
1922
Environment.ExpandEnvironmentVariables(pathWithEnv);
2023
let replacePaths (s : string) =
2124
s

0 commit comments

Comments
 (0)