From ae027935605f787e46a627fa60ea5471fc9db685 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Thu, 14 Oct 2021 01:15:37 +0000
Subject: [PATCH 1/4] Exclude unit and performance test from source-build

---
 perf/dotnet-format.Performance.csproj | 1 +
 tests/dotnet-format.UnitTests.csproj  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/perf/dotnet-format.Performance.csproj b/perf/dotnet-format.Performance.csproj
index dd4c95e2cc..c96e8b87d7 100644
--- a/perf/dotnet-format.Performance.csproj
+++ b/perf/dotnet-format.Performance.csproj
@@ -14,6 +14,7 @@
 
     <!-- Always run on the latest runtime installed. -->
     <RollForward>LatestMajor</RollForward>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj
index 06dbbb4b75..f566d6a089 100644
--- a/tests/dotnet-format.UnitTests.csproj
+++ b/tests/dotnet-format.UnitTests.csproj
@@ -12,6 +12,7 @@
     <!-- Always run on the latest runtime installed. -->
     <RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
     <RollForward>LatestMajor</RollForward>
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
   </PropertyGroup>
 
   <ItemGroup>

From d392c7845c1653ee9f341c33d8e8a7749621eab8 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 14 Oct 2021 10:35:52 +0000
Subject: [PATCH 2/4] Package version changes to support source-build

---
 Directory.Packages.props | 3 +--
 eng/Versions.props       | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 57c27350ad..6b628c22a2 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -2,7 +2,6 @@
   <!-- <Import Project="eng\Versions.props" /> -->
 
   <PropertyGroup>
-    <MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
     <MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
     <!-- In order tests against the same version of NuGet as the SDK. We have to set this to match. -->
     <NuGetVersion>6.0.0-preview.4.221</NuGetVersion>
@@ -15,7 +14,7 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.4.1" />
     <PackageVersion Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)"/>
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.1-beta1.21413.1" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(MicrosoftCodeAnalysisAnalyzersVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftNETCoreCompilersPackageVersion)" />
diff --git a/eng/Versions.props b/eng/Versions.props
index 69ce6d435b..b1990aa8a7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,6 +13,8 @@
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
   </PropertyGroup>
   <PropertyGroup>
+    <MicrosoftBuildVersion>16.11.0</MicrosoftBuildVersion>
+    <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
     <MicrosoftNETCoreCompilersPackageVersion>4.0.0-6.21515.3</MicrosoftNETCoreCompilersPackageVersion>
     <!-- Dependencies from https://github.com/dotnet/command-line-api -->

From 5a7b54b7508ad0f3d2f4fa30bfc9ccc4475becb5 Mon Sep 17 00:00:00 2001
From: "msimons@microsoft.com" <msimons@microsoft.com>
Date: Tue, 19 Oct 2021 14:32:25 +0000
Subject: [PATCH 3/4] Project changes to eliminate prebuilts

---
 src/dotnet-format.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index dbc94b8685..994e539943 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -19,7 +19,6 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
     <!-- Always run on the latest runtime installed. -->
-    <RuntimeFrameworkVersion>6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
     <RollForward>LatestMajor</RollForward>
 
     <IsPackable>true</IsPackable>
@@ -29,7 +28,7 @@
       These identifiers are for generating the shim'd core executables for signing. Not all options
       from $(RoslynPortableRuntimeIdentifiers) work or make sense in this context.
     -->
-    <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
+    <PackAsToolShimRuntimeIdentifiers Condition=" '$(DotnetBuildFromSource)' != 'true' ">win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>

From 5ab5bf327b0fe205db793ca4916d769d05475239 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Tue, 19 Oct 2021 22:04:46 +0000
Subject: [PATCH 4/4] Edits to fix tests

---
 src/dotnet-format.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dotnet-format.csproj b/src/dotnet-format.csproj
index 994e539943..5f691e6e6e 100644
--- a/src/dotnet-format.csproj
+++ b/src/dotnet-format.csproj
@@ -19,6 +19,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
     <!-- Always run on the latest runtime installed. -->
+    <RuntimeFrameworkVersion Condition=" '$(DotnetBuildFromSource)' != 'true' ">6.0.0-preview.7.21317.1</RuntimeFrameworkVersion>
     <RollForward>LatestMajor</RollForward>
 
     <IsPackable>true</IsPackable>