Set plain dotnet build in devcontainer (#14991)

* Set plain dotnet build in devcontainer * Set output explicitly * Update launch and tasks specs
dotnet · Mar 29, 2023 · 9fae71f · 9fae71f
1 parent 56123ad
commit 9fae71f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 37 deletions.
diff --git 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
diff --git 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
@@ -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.
     ]
 }
diff --git 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
@@ -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
@@ -488,6 +488,11 @@
     </None>
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
+    <OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
     <!-- We are setting TFM explicitly here, since we are only using fslexyacc's dlls in msbuild -->
     <ProjectReference Include="$(RepoRoot)\buildtools\fslex\fslex.fsproj" ReferenceOutputAssembly="False">

diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
@@ -18,6 +18,11 @@
     <CompressMetadata Condition="'$(CompressAllMetadata)' != 'true'">false</CompressMetadata>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
+    <OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
+  </PropertyGroup>
+
   <Target Name="CopyToBuiltBin" BeforeTargets="BuiltProjectOutputGroup" AfterTargets="CoreCompile">
     <PropertyGroup>
       <BuildOutputGroupLocation>$(BaseOutputPath)\$(Configuration)\$(TargetFramework)</BuildOutputGroupLocation>

diff --git a/src/fsc/fscProject/fsc.fsproj b/src/fsc/fscProject/fsc.fsproj
@@ -15,6 +15,11 @@
     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
+    <OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
+  </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove('fsc.targets', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>
diff --git a/src/fsi/fsiProject/fsi.fsproj b/src/fsi/fsiProject/fsi.fsproj
@@ -15,6 +15,11 @@
     <PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(BUILDING_USING_DOTNET)' == 'true'">
+    <OutputPath>$(ArtifactsDir)/bin/$(MSBuildProjectName)/$(Configuration)/</OutputPath>
+    <IntermediateOutputPath>$(ArtifactsDir)obj/$(MSBuildProjectName)/$(Configuration)/</IntermediateOutputPath>
+  </PropertyGroup>
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove('fsi.targets', '$(MSBuildThisFileDirectory)../'))" />
 
 </Project>