dotnet
/
test-templates
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Integrate source-build patches into source

This commit is contained in:
Michael Simons 2021-06-17 16:39:02 +00:00
Родитель 07976758ed
Коммит 3c2c1fbd81
5 изменённых файлов: 4 добавлений и 242 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
eng/Build.props
Просмотреть файл

@ -3,8 +3,8 @@
<!-- 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" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\Templates\MSTestTemplates.sln" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\WizardExtensions\WizardExtensions.sln" Condition="'$(DotNetBuildFromSource)' != 'true'" />
<ProjectToBuild Include="$(MSBuildThisFileDirectory)..\test\Microsoft.TestTemplates.Acceptance.Tests.sln" Condition="'$(DotNetBuildFromSource)' != 'true'" />
</ItemGroup>
</Project>

15
eng/SourceBuild.props
Просмотреть файл

@ -5,19 +5,4 @@
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
</PropertyGroup>
<Target Name="ApplySourceBuildPatchFiles"
Condition="
'$(ArcadeBuildFromSource)' == 'true'"
AfterTargets="PrepareInnerSourceBuildRepoRoot">
<ItemGroup>
<SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" />
</ItemGroup>
<Exec
Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
WorkingDirectory="$(CurrentRepoSourceBuildSourceDir)"
Condition="'@(SourceBuildPatchFile)' != ''" />
</Target>
</Project>

1
eng/Version.Details.xml
Просмотреть файл

@ -6,6 +6,7 @@
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21311.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>4a2b475948d498b89fedef7cf890883f49bc1ea3</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
</Dependencies>

157
eng/source-build-patches/0002-Remove-test-template-tests.patch
Просмотреть файл

@ -1,157 +0,0 @@
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
eng/source-build-patches/0003-Fix-casing-in-project-files.patch
Просмотреть файл

@ -1,67 +0,0 @@
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