diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index a61ae1ed93a2dc3dcb720ad8cd2aab4c4f8f5285..758cd5ef1c2a92a8da0c844425ecea67155473b1 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -21,3 +21,6 @@ RUN apt-get update \
# Switch back to dialog for any ad-hoc use of apt-get
ENV DEBIAN_FRONTEND=dialog
+
+# Make sure we can build using plain dotnet
+ENV BUILDING_USING_DOTNET=true
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 813f774b07f740bf7f2e756e73de73d45cc1181b..a0118990e74cf6abe487ba85d2cea0550559ae25 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -34,6 +34,7 @@
"stopAtEntry": false,
"justMyCode": true,
"enableStepFiltering": true,
+ "requireExactSource": false,
"symbolOptions": {
"searchMicrosoftSymbolServer": true,
"searchNuGetOrgSymbolServer": true
@@ -62,6 +63,7 @@
"stopAtEntry": false,
"justMyCode": true,
"enableStepFiltering": true,
+ "requireExactSource": false,
"symbolOptions": {
"searchMicrosoftSymbolServer": true,
"searchNuGetOrgSymbolServer": true
@@ -84,6 +86,7 @@
},
"justMyCode": true,
"enableStepFiltering": false,
+ "requireExactSource": false
}
]
}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b20a77fcc8db4dfff85a23179d5576079705c6ca..6a15d101828c8f052ba2e901191a72503e7bb35b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -15,52 +15,45 @@
},
"tasks": [
{
- "label": "Full Build (Debug)",
- "command": "./build.sh",
+ "label": "Build (Debug)",
+ "command": "dotnet",
"type": "shell",
"args": [
- "-c Debug"
+ "build",
+ "-c Debug",
+ "FSharp.Compiler.Service.sln"
],
"windows": {
- "command": "${workspaceFolder}/Build.cmd",
+ "command": "dotnet",
"args": [
+ "build",
"-c Debug",
- "-noVisualStudio"
+ "FSharp.Compiler.Service.sln"
],
},
"problemMatcher": "$msCompile",
"group": "build",
},
{
- "label": "Full Build (Release)",
- "command": "./build.sh",
+ "label": "Build (Release)",
+ "command": "dotnet",
"type": "shell",
"args": [
- "-c Release"
+ "build",
+ "-c Release",
+ "FSharp.Compiler.Service.sln"
],
"windows": {
- "command": "${workspaceFolder}/Build.cmd",
+ "command": "dotnet",
"args": [
+ "build",
"-c Release",
- "-noVisualStudio"
+ "FSharp.Compiler.Service.sln"
],
},
"problemMatcher": "$msCompile",
"group": "build",
},
- {
- "label": "Rebuild (Debug)",
- "command": "dotnet",
- "type": "shell",
- "args": [
- "build",
- "-c",
- "Debug",
- "${workspaceFolder}/FSharp.sln"
- ],
- "problemMatcher": "$msCompile",
- "group": "build",
- },
{
"label": "Update xlf files",
"command": "./build.sh",
@@ -75,20 +68,6 @@
},
"problemMatcher": "$msCompile",
"group": "build"
- },
- {
- "label": "Run tests (all but integration)",
- "command": "./build.sh",
- "type": "shell",
- "args": [
- "-testAllButIntegration"
- ],
- "windows": {
- "command": "${workspaceFolder}/Build.cmd",
- },
- "problemMatcher": "$msCompile",
- "group": "test"
}
- // TODO: Add more test tasks if necessary.
]
}
\ No newline at end of file
diff --git a/eng/Build.ps1 b/eng/Build.ps1
index ac851ffd9abfdce551330eda364f4c61b8a65f3b..b3053f02a4b7e8f9caae91b69f9504aad418328a 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -261,6 +261,7 @@ function BuildSolution([string] $solutionName) {
/p:TestTargetFrameworks=$testTargetFrameworks `
/p:DotNetBuildFromSource=$sourceBuild `
/p:CompressAllMetadata=$CompressAllMetadata `
+ /p:BUILDING_USING_DOTNET=false `
/v:$verbosity `
$suppressExtensionDeployment `
@properties
diff --git a/eng/build.sh b/eng/build.sh
index fff8414b3ef22bce505205bd19a7bed43a0b299c..510c1297fbd82e50cdcf4377ac22666ed506fa2b 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -295,6 +295,7 @@ function BuildSolution {
/p:QuietRestore=$quiet_restore \
/p:QuietRestoreBinaryLog="$binary_log" \
/p:ArcadeBuildFromSource=$source_build \
+ /p:BUILDING_USING_DOTNET=false \
$properties
fi
}
diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
index 6eaa0530141d4b20e740bf27e659379e24c48f2f..537636de0727ed3637581071ce48788201f46ce1 100644
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
@@ -488,6 +488,11 @@
+
+ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/
+ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/
+
+
diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
index 0a1ff407bd2a51cc4a9e77303bbd2f605a93948a..c0d27860b6b4e39e52cfffe16b071d3317e9836e 100644
--- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
+++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
@@ -18,6 +18,11 @@
false
+
+ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/
+ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/
+
+
$(BaseOutputPath)\$(Configuration)\$(TargetFramework)
diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
index fdfd38db98baa98446c1529be4d86662cd102ff9..9172eefa5c036cdcd7886adda4aeb1408047b555 100644
--- a/src/fsc/fscProject/fsc.fsproj
+++ b/src/fsc/fscProject/fsc.fsproj
@@ -15,6 +15,11 @@
x86
+
+ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/
+ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/
+
+
diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
index 9708c2342412cf5fc2ab8d8608c4bddfde241464..799fc1362e60b45f5d5c3cc1a1c9a26b14980c0e 100644
--- a/src/fsi/fsiProject/fsi.fsproj
+++ b/src/fsi/fsiProject/fsi.fsproj
@@ -15,6 +15,11 @@
x86
+
+ $(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/
+ $(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/
+
+