Skip to content

Enable source-build with arcade #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Haplois merged 1 commit into from
Feb 11, 2021
Merged

Enable source-build with arcade #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 LICENSE → LICENSE.txt
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ stages:
enablePublishTestResults: true
enablePublishBuildAssets: true
enablePublishUsingPipelines: $(_PublishUsingPipelines)
enableSourceBuild: true
enableTelemetry: true
helixRepo: dotnet/test-templates
jobs:
Expand Down
Empty file modified build.sh
100644 → 100755
View file
Open in desktop
Empty file.
23 changes: 23 additions & 0 deletions eng/SourceBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Project>

<PropertyGroup>
<GitHubRepositoryName>test-templates</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
</PropertyGroup>

<Target Name="ApplySourceBuildPatchFiles"
Condition="
'$(ArcadeBuildFromSource)' == 'true'"
AfterTargets="PrepareInnerSourceBuildRepoRoot">

<ItemGroup>
<SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
Copy link
Member Author

@omajid omajid Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RepositoryEngineeringDir refers to the original/outer repo. This can break badly, right? Is there something that that points to the eng dir of the inner repo?

Copy link
Member

@dagood dagood Feb 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't think of anything that would happen differently depending on whether this uses the files in the outer repo in the inner repo. The outer and inner repo are always the same source code. The PrepareInnerSourceBuildRepoRoot target only executes in the context of the outer repo, so the patches will always be there.

I think there is a quirk where if the outer repo has some unstaged file additions, they don't transfer over properly into the inner repo. (This is based on git stash behavior.) But that's just dev workflow, which isn't a priority for ArPow right now--and it's easy to just stage the files to work around this. (Edit: Filed dotnet/source-build#2047 to make this more visible, though, now that I'm thinking about it.)

There wouldn't be any harm in adding a prop in dotnet/arcade to refer to the inner eng dir, though: https://github.com/dotnet/arcade/blob/e4ab5cb034f0c40b4a52a5952b20809daaa2f39b/src/Microsoft.DotNet.Arcade.Sdk/tools/SourceBuild/SourceBuildArcade.targets#L19-L20

</ItemGroup>

<Exec
Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
WorkingDirectory="$(CurrentRepoSourceBuildSourceDir)"
Condition="'@(SourceBuildPatchFile)' != ''" />
</Target>

</Project>
5 changes: 5 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="*/*" />
</IgnorePatterns>
</UsageData>
Empty file modified eng/common/SetupNugetSources.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/build.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cibuild.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/arm64/tizen-build-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/arm64/tizen-fetch.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/armel/tizen-build-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/armel/tizen-fetch.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/build-android-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/cross/build-rootfs.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/darc-init.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/dotnet-install.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/init-tools-native.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/internal-feed-operations.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/msbuild.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/common-library.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/find-native-compiler.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/install-cmake-test.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/native/install-cmake.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/performance/performance-setup.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/pipeline-logging-functions.sh
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified eng/common/tools.sh
100644 → 100755
View file
Open in desktop
Empty file.
157 changes: 157 additions & 0 deletions eng/source-build-patches/0002-Remove-test-template-tests.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
From 21884b9bf6eedd87e085ae3765ea20c69be85f8c Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Thu, 22 Oct 2020 10:26:14 -0500
Subject: [PATCH 2/2] Remove test-template tests

---
Templates/MSTestTemplates.sln | 43 -------------------
WizardExtensions/WizardExtensions.sln | 40 -----------------
eng/Build.props | 3 --
...crosoft.TestTemplates.Acceptance.Tests.sln | 25 -----------
4 files changed, 111 deletions(-)
delete mode 100644 Templates/MSTestTemplates.sln
delete mode 100644 WizardExtensions/WizardExtensions.sln
delete mode 100644 test/Microsoft.TestTemplates.Acceptance.Tests.sln

diff --git a/Templates/MSTestTemplates.sln b/Templates/MSTestTemplates.sln
deleted file mode 100644
index 1ef0e13..0000000
--- a/Templates/MSTestTemplates.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestDesktopVB", "VisualBasic\Desktop\MSTestDesktopVB.csproj", "{1AFFAE1C-BD70-4201-B8C8-3862F56E784B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSTestDesktopCSharp", "CSharp\Desktop\MSTestDesktopCSharp.csproj", "{9E08BE4A-D3C8-4E8D-AFBE-FA571F878464}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDriverTemplate", "CSharp\EdgeDriverTemplate\DotNetFramwork\EdgeDriverTemplate.csproj", "{6E299C10-B3AD-4D9F-BA12-333BEE9CDCC1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EdgeDriverTemplateCore", "CSharp\EdgeDriverTemplate\DotNetCore\EdgeDriverTemplateCore\EdgeDriverTemplateCore.csproj", "{831B6078-B48F-4697-9C70-2EBF6B64CADF}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1AFFAE1C-BD70-4201-B8C8-3862F56E784B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1AFFAE1C-BD70-4201-B8C8-3862F56E784B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1AFFAE1C-BD70-4201-B8C8-3862F56E784B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1AFFAE1C-BD70-4201-B8C8-3862F56E784B}.Release|Any CPU.Build.0 = Release|Any CPU
- {9E08BE4A-D3C8-4E8D-AFBE-FA571F878464}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9E08BE4A-D3C8-4E8D-AFBE-FA571F878464}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9E08BE4A-D3C8-4E8D-AFBE-FA571F878464}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9E08BE4A-D3C8-4E8D-AFBE-FA571F878464}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E299C10-B3AD-4D9F-BA12-333BEE9CDCC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E299C10-B3AD-4D9F-BA12-333BEE9CDCC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E299C10-B3AD-4D9F-BA12-333BEE9CDCC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E299C10-B3AD-4D9F-BA12-333BEE9CDCC1}.Release|Any CPU.Build.0 = Release|Any CPU
- {831B6078-B48F-4697-9C70-2EBF6B64CADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {831B6078-B48F-4697-9C70-2EBF6B64CADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {831B6078-B48F-4697-9C70-2EBF6B64CADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {831B6078-B48F-4697-9C70-2EBF6B64CADF}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {25915A37-21DC-4A13-8A1D-A05332CA3D17}
- EndGlobalSection
-EndGlobal
diff --git a/WizardExtensions/WizardExtensions.sln b/WizardExtensions/WizardExtensions.sln
deleted file mode 100644
index 18c6e9e..0000000
--- a/WizardExtensions/WizardExtensions.sln
+++ /dev/null
@@ -1,40 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26106.7
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTestv2UnitTestExtension", "MSTestv2UnitTestExtension\MSTestv2UnitTestExtension.csproj", "{25BFACE8-5009-498E-9B18-3E417C312F26}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTestv2IntelliTestExtension", "MSTestv2IntelliTestExtension\MSTestv2IntelliTestExtension.csproj", "{AAB9F3CF-72D5-419B-B31E-209388BF3E7C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTestv2IntelliTestExtensionPackage", "MSTestv2IntelliTestExtensionPackage\MSTestv2IntelliTestExtensionPackage.csproj", "{88308F8C-9B6A-4FC1-BA78-F7106987CE56}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTestv2UnitTestExtensionPackage", "MSTestv2UnitTestExtensionPackage\MSTestv2UnitTestExtensionPackage.csproj", "{4348D191-1028-4031-8FCB-B0EF7329271D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {25BFACE8-5009-498E-9B18-3E417C312F26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {25BFACE8-5009-498E-9B18-3E417C312F26}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {25BFACE8-5009-498E-9B18-3E417C312F26}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {25BFACE8-5009-498E-9B18-3E417C312F26}.Release|Any CPU.Build.0 = Release|Any CPU
- {AAB9F3CF-72D5-419B-B31E-209388BF3E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AAB9F3CF-72D5-419B-B31E-209388BF3E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AAB9F3CF-72D5-419B-B31E-209388BF3E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AAB9F3CF-72D5-419B-B31E-209388BF3E7C}.Release|Any CPU.Build.0 = Release|Any CPU
- {88308F8C-9B6A-4FC1-BA78-F7106987CE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {88308F8C-9B6A-4FC1-BA78-F7106987CE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {88308F8C-9B6A-4FC1-BA78-F7106987CE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {88308F8C-9B6A-4FC1-BA78-F7106987CE56}.Release|Any CPU.Build.0 = Release|Any CPU
- {4348D191-1028-4031-8FCB-B0EF7329271D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4348D191-1028-4031-8FCB-B0EF7329271D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4348D191-1028-4031-8FCB-B0EF7329271D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4348D191-1028-4031-8FCB-B0EF7329271D}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/eng/Build.props b/eng/Build.props
index 9140eca..cb3ac52 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -3,8 +3,5 @@
<!-- Specify the solutions to build. Add all new solutions/projects here as necessary or the main build won't build them! -->
<ItemGroup>
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\template_feed\NetCoreTestTemplates.sln" />
- <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Templates\MSTestTemplates.sln" />
- <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\WizardExtensions\WizardExtensions.sln" />
- <ProjectToBuild Include="$(MSBuildThisFileDirectory)..\test\Microsoft.TestTemplates.Acceptance.Tests.sln" />
</ItemGroup>
</Project>
diff --git a/test/Microsoft.TestTemplates.Acceptance.Tests.sln b/test/Microsoft.TestTemplates.Acceptance.Tests.sln
deleted file mode 100644
index 7d8605a..0000000
--- a/test/Microsoft.TestTemplates.Acceptance.Tests.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30404.172
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestTemplates.Acceptance.Tests", "Microsoft.TestTemplates.Acceptance.Tests\Microsoft.TestTemplates.Acceptance.Tests.csproj", "{369E063C-1823-4213-BF99-504002639ED1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {369E063C-1823-4213-BF99-504002639ED1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {369E063C-1823-4213-BF99-504002639ED1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {369E063C-1823-4213-BF99-504002639ED1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {369E063C-1823-4213-BF99-504002639ED1}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {CDFEF38D-33CE-4011-90A1-C63A1CD2EA31}
- EndGlobalSection
-EndGlobal
--
2.18.0

67 changes: 67 additions & 0 deletions eng/source-build-patches/0003-Fix-casing-in-project-files.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
From ef25c5a4142b1a52c7996e8a281afa879c5ae3d0 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Thu, 22 Oct 2020 14:31:25 -0500
Subject: [PATCH 3/3] Fix casing in project files.

---
.../Microsoft.DotNet.Test.ProjectTemplates.2.1.csproj | 2 +-
.../Microsoft.DotNet.Test.ProjectTemplates.3.0.csproj | 2 +-
.../Microsoft.DotNet.Test.ProjectTemplates.3.1.csproj | 2 +-
.../Microsoft.DotNet.Test.ProjectTemplates.5.0.csproj | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/Microsoft.DotNet.Test.ProjectTemplates.2.1.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/Microsoft.DotNet.Test.ProjectTemplates.2.1.csproj
index 5767aee..6f7bba5 100644
--- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/Microsoft.DotNet.Test.ProjectTemplates.2.1.csproj
+++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/Microsoft.DotNet.Test.ProjectTemplates.2.1.csproj
@@ -24,7 +24,7 @@
<PackageReference Remove="Microsoft.NETCore.App" />
<Compile Remove="$(GitInfoFile)" />
<Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
- <Content Include="Content\**" >
+ <Content Include="content\**" >
<PackagePath>content</PackagePath>
</Content>
</ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.0/Microsoft.DotNet.Test.ProjectTemplates.3.0.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.0/Microsoft.DotNet.Test.ProjectTemplates.3.0.csproj
index 5eab5b3..6951001 100644
--- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.0/Microsoft.DotNet.Test.ProjectTemplates.3.0.csproj
+++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.0/Microsoft.DotNet.Test.ProjectTemplates.3.0.csproj
@@ -24,7 +24,7 @@
<PackageReference Remove="Microsoft.NETCore.App" />
<Compile Remove="$(GitInfoFile)" />
<Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
- <Content Include="Content\**" >
+ <Content Include="content\**" >
<PackagePath>content</PackagePath>
</Content>
</ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.1/Microsoft.DotNet.Test.ProjectTemplates.3.1.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.1/Microsoft.DotNet.Test.ProjectTemplates.3.1.csproj
index 7caa2bf..f5603e0 100644
--- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.1/Microsoft.DotNet.Test.ProjectTemplates.3.1.csproj
+++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.3.1/Microsoft.DotNet.Test.ProjectTemplates.3.1.csproj
@@ -24,7 +24,7 @@
<PackageReference Remove="Microsoft.NETCore.App" />
<Compile Remove="$(GitInfoFile)" />
<Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
- <Content Include="Content\**" >
+ <Content Include="content\**" >
<PackagePath>content</PackagePath>
</Content>
</ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.5.0/Microsoft.DotNet.Test.ProjectTemplates.5.0.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.5.0/Microsoft.DotNet.Test.ProjectTemplates.5.0.csproj
index c39ab4c..0381c0f 100644
--- a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.5.0/Microsoft.DotNet.Test.ProjectTemplates.5.0.csproj
+++ b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.5.0/Microsoft.DotNet.Test.ProjectTemplates.5.0.csproj
@@ -24,7 +24,7 @@
<PackageReference Remove="Microsoft.NETCore.App" />
<Compile Remove="$(GitInfoFile)" />
<Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
- <Content Include="Content\**">
+ <Content Include="content\**">
<PackagePath>content</PackagePath>
</Content>
</ItemGroup>
--
2.18.0