diff --git a/src/SourceBuild/tarball/content/repos/format.proj b/src/SourceBuild/tarball/content/repos/format.proj new file mode 100644 index 000000000..280856ab2 --- /dev/null +++ b/src/SourceBuild/tarball/content/repos/format.proj @@ -0,0 +1,22 @@ + + + + + $(ProjectDirectory)eng\common\build$(ShellExtension) $(StandardSourceBuildArgs) + + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + false + + + + + + + + + + + + + diff --git a/src/SourceBuild/tarball/content/repos/known-good.proj b/src/SourceBuild/tarball/content/repos/known-good.proj index 1208a937a..eab516290 100644 --- a/src/SourceBuild/tarball/content/repos/known-good.proj +++ b/src/SourceBuild/tarball/content/repos/known-good.proj @@ -54,6 +54,7 @@ + diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj index 9cb477726..22f91b0eb 100644 --- a/src/SourceBuild/tarball/content/repos/sdk.proj +++ b/src/SourceBuild/tarball/content/repos/sdk.proj @@ -42,6 +42,7 @@ + diff --git a/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch new file mode 100644 index 000000000..58f729c98 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0001-Exclude-unit-and-performance-test-from-source-build.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MichaelSimons +Date: Thu, 14 Oct 2021 01:15:37 +0000 +Subject: [PATCH] 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 dd4c95e..c96e8b8 100644 +--- a/perf/dotnet-format.Performance.csproj ++++ b/perf/dotnet-format.Performance.csproj +@@ -14,6 +14,7 @@ + + + LatestMajor ++ true + + + +diff --git a/tests/dotnet-format.UnitTests.csproj b/tests/dotnet-format.UnitTests.csproj +index 06dbbb4..f566d6a 100644 +--- a/tests/dotnet-format.UnitTests.csproj ++++ b/tests/dotnet-format.UnitTests.csproj +@@ -12,6 +12,7 @@ + + 6.0.0-preview.7.21317.1 + LatestMajor ++ true + + + diff --git a/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch new file mode 100644 index 000000000..33535cae1 --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0002-Package-version-changes-to-support-source-build.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Thu, 14 Oct 2021 10:35:52 +0000 +Subject: [PATCH] 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 57c2735..6b628c2 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -2,7 +2,6 @@ + + + +- 16.11.0 + 5.0.0 + + 6.0.0-preview.4.221 +@@ -15,7 +14,7 @@ + + + +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 7a39a9c..5270ea4 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -13,6 +13,8 @@ + true + + ++ 16.11.0 ++ 3.3.2 + + 4.0.0-6.21515.3 + diff --git a/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch new file mode 100644 index 000000000..c1e097eeb --- /dev/null +++ b/src/SourceBuild/tarball/patches/format/0003-Project-changes-to-eliminate-prebuilts.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "msimons@microsoft.com" +Date: Tue, 19 Oct 2021 14:32:25 +0000 +Subject: [PATCH] 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 dbc94b8..994e539 100644 +--- a/src/dotnet-format.csproj ++++ b/src/dotnet-format.csproj +@@ -19,7 +19,6 @@ + true + + +- 6.0.0-preview.7.21317.1 + LatestMajor + + true +@@ -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. + --> +- win-x64;win-x86;osx-x64 ++ win-x64;win-x86;osx-x64 + + + diff --git a/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch new file mode 100644 index 000000000..763c5f3b2 --- /dev/null +++ b/src/SourceBuild/tarball/patches/source-build/0001-Fix-humanizer-assembly-version.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "msimons@microsoft.com" +Date: Tue, 19 Oct 2021 18:59:23 +0000 +Subject: [PATCH] Fix humanizer assembly version + +Patch for https://github.com/dotnet/source-build/pull/2539 +--- + .../humanizer/0001-Fix-building-in-a-source-build-context.patch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch +index 8d31028..7a5e5f3 100644 +--- a/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch ++++ b/patches/humanizer/0001-Fix-building-in-a-source-build-context.patch +@@ -24,7 +24,7 @@ index 842a373..e018285 100644 + netstandard1.0 + Mehdi Khalili, Oren Novotny + https://raw.githubusercontent.com/Humanizr/Humanizer/master/LICENSE +-+ 2.2.0 +++ 2.2.0 + https://github.com/Humanizr/Humanizer + 2.12 + A micro-framework that turns your normal strings, type names, enum fields, date fields ETC into a human friendly format