Build samples using locally published tools

Results in faster builds since we don't need to build the compiler every time. But this also means that we should not forget to compile the compiler every time we make changes to it.
terrajobst · May 9, 2020 · f84b958 · f84b958
1 parent 892508d
commit f84b958
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -23,6 +23,14 @@ steps:
     projects: $(tests)
     arguments: -c $(buildConfiguration)
     publishTestResults: true
+- task: DotNetCoreCLI@2
+  displayName: Publish minsk ($(buildConfiguration))
+  inputs:
+    command: publish
+    projects: $(sln)
+    arguments: -c $(buildConfiguration)
+    publishWebProjects: false
+    zipAfterPublish: false
 - task: DotNetCoreCLI@2
   displayName: Build samples ($(buildConfiguration))
   inputs:

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -7,4 +7,8 @@
     <PublishDir>$(SolutionDir)publish</PublishDir>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MinskToolsPath Condition="'$(MinskToolsPath)' == ''">$(RepositoryDir)artifacts\Minsk\</MinskToolsPath>
+  </PropertyGroup>
+
 </Project>
diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets
@@ -9,8 +9,18 @@
                                 '%(FileName)' != 'System.Runtime' AND
                                 '%(FileName)' != 'System.Runtime.Extensions'" />
     </ItemGroup>
-    <Exec Command="dotnet run --project &quot;$(MSBuildThisFileDirectory)\..\src\msc\msc.csproj&quot; -- @(Compile->'&quot;%(Identity)&quot;', ' ') /o &quot;@(IntermediateAssembly)&quot; @(ReferencePath->'/r &quot;%(Identity)&quot;', ' ')"
-          WorkingDirectory="$(MSBuildProjectDirectory)" />
+
+    <PropertyGroup>
+      <MinskCompilerArgs>@(Compile->'"%(Identity)"', ' ')</MinskCompilerArgs>
+      <MinskCompilerArgs>$(MinskCompilerArgs) /o "@(IntermediateAssembly)"</MinskCompilerArgs>
+      <MinskCompilerArgs>$(MinskCompilerArgs) @(ReferencePath->'/r "%(Identity)"', ' ')</MinskCompilerArgs>
+
+      <MinskExeExt Condition="$([MSBuild]::IsOSPlatform('Windows'))">.exe</MinskExeExt>
+      <MinskCompilerExe Condition="'$(MinskCompilerExe)' == ''">msc$(MinskExeExt)</MinskCompilerExe>
+      <MinskCompileCommand>"$([MSBuild]::NormalizePath('$(MinskToolsPath)', '$(MinskCompilerExe)'))" $(MinskCompilerArgs)</MinskCompileCommand>
+    </PropertyGroup>
+
+    <Exec Command="$(MinskCompileCommand)" />
   </Target>
 
 </Project>