Updated nuke build

RocketSurgeonsGuild · Jul 4, 2019 · 64cf969 · 64cf969
1 parent 8eec2d3
commit 64cf969
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 53 deletions.
diff --git a/.build/.build.csproj b/.build/.build.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../src/Nuke/build/Rocket.Surgery.Nuke.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -20,18 +21,7 @@
     <NukeSpecificationFiles Include="**\*.json" Exclude="bin\**;obj\**" />
     <NukeExternalFiles Include="**\*.*.ext" Exclude="bin\**;obj\**" />
     <None Remove="*.csproj.DotSettings;*.ref.*.txt" />
-
-    <!-- Common build related files -->
-    <None Include="..\build.ps1" />
-    <None Include="..\build.sh" />
-    <None Include="..\.nuke" />
-    <None Include="..\global.json" Condition="Exists('..\global.json')" />
-    <None Include="..\nuget.config" Condition="Exists('..\nuget.config')" />
-    <None Include="..\azure-pipelines.yml" Condition="Exists('..\azure-pipelines.yml')" />
-    <None Include="..\Jenkinsfile" Condition="Exists('..\Jenkinsfile')" />
-    <None Include="..\appveyor.yml" Condition="Exists('..\appveyor.yml')" />
-    <None Include="..\.travis.yml" Condition="Exists('..\.travis.yml')" />
-    <None Include="..\GitVersion.yml" Condition="Exists('..\GitVersion.yml')" />
   </ItemGroup>
 
+  <Import Project="../src/Nuke/build/Rocket.Surgery.Nuke.targets" />
 </Project>
diff --git a/.build/.build.csproj.DotSettings b/.build/.build.csproj.DotSettings
@@ -1,4 +1,4 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/CodeInspection/ImplicitNullability/EnableFields/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
@@ -17,6 +17,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

diff --git a/Nuke.sln b/Nuke.sln
@@ -1,17 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29006.145
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{42D7A8A5-D2BB-4D82-8FA9-5037831B00FD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8FFDF555-DB50-45F9-9A2D-6410F39151C3}"
+	ProjectSection(SolutionItems) = preProject
+		src\Directory.Build.props = src\Directory.Build.props
+		src\Directory.Build.targets = src\Directory.Build.targets
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.Nuke", "src\Nuke\Rocket.Surgery.Nuke.csproj", "{DBE72DEC-581A-43EA-B718-96726D3DBD8F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF33E0FB-9790-4654-B60F-8AB22E0CC3D1}"
+	ProjectSection(SolutionItems) = preProject
+		test\Directory.Build.props = test\Directory.Build.props
+		test\Directory.Build.targets = test\Directory.Build.targets
+	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{5685E4E9-95D8-4676-AF74-83FD6BCC028F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = ".build", ".build\.build.csproj", "{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.Nuke.Tests", "test\Nuke.Tests\Rocket.Surgery.Nuke.Tests.csproj", "{8D09B6D7-555E-4432-86A4-54EE89A25D11}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{E3DCB78E-EE06-4EA3-88AC-762D8910387C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = ".build", ".build\.build.csproj", "{014F909E-7E46-4949-8A31-EEE63704F4E8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.Nuke", "src\Nuke\Rocket.Surgery.Nuke.csproj", "{C33C63CF-8760-4305-B9AC-14456930C867}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rocket.Surgery.Nuke.Tests", "test\Nuke.Tests\Rocket.Surgery.Nuke.Tests.csproj", "{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -22,39 +32,51 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Debug|x64.Build.0 = Debug|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Debug|x86.Build.0 = Debug|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Release|x64.ActiveCfg = Release|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Release|x64.Build.0 = Release|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Release|x86.ActiveCfg = Release|Any CPU
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610}.Release|x86.Build.0 = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|x64.Build.0 = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Debug|x86.Build.0 = Debug|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|x64.ActiveCfg = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|x64.Build.0 = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|x86.ActiveCfg = Release|Any CPU
+		{C33C63CF-8760-4305-B9AC-14456930C867}.Release|x86.Build.0 = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|x64.Build.0 = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Debug|x86.Build.0 = Debug|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x64.ActiveCfg = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x64.Build.0 = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x86.ActiveCfg = Release|Any CPU
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{014F909E-7E46-4949-8A31-EEE63704F4E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{014F909E-7E46-4949-8A31-EEE63704F4E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|x64.Build.0 = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Debug|x86.Build.0 = Debug|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|x64.ActiveCfg = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|x64.Build.0 = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|x86.ActiveCfg = Release|Any CPU
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F}.Release|x86.Build.0 = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|x64.Build.0 = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Debug|x86.Build.0 = Debug|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|x64.ActiveCfg = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|x64.Build.0 = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|x86.ActiveCfg = Release|Any CPU
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{DBE72DEC-581A-43EA-B718-96726D3DBD8F} = {42D7A8A5-D2BB-4D82-8FA9-5037831B00FD}
-		{8D09B6D7-555E-4432-86A4-54EE89A25D11} = {5685E4E9-95D8-4676-AF74-83FD6BCC028F}
+		{55EFAE2F-A7CA-4917-A381-4A6EF5E79610} = {E3DCB78E-EE06-4EA3-88AC-762D8910387C}
+		{C33C63CF-8760-4305-B9AC-14456930C867} = {8FFDF555-DB50-45F9-9A2D-6410F39151C3}
+		{29950FB4-8A41-4C83-9FE0-FEA9C8D0BF67} = {DF33E0FB-9790-4654-B60F-8AB22E0CC3D1}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {439897C2-CCBD-44FE-B2DC-A3E4670ADA59}
 	EndGlobalSection
 EndGlobal
diff --git a/Packages.props b/Packages.props
@@ -8,8 +8,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="Nuke.Common" Version="0.20.1" />
-    <PackageReference Update="Rocket.Surgery.Nuke" Version="0.1.0-beta.9" />
-    <PackageReference Update="GitVersion.CommandLine.DotNetCore" Version="5.0.0-beta5.1" />
+    <PackageReference Update="Rocket.Surgery.Nuke" Version="0.1.0-beta.11" />
+    <PackageReference Update="GitVersion.CommandLine.DotNetCore" Version="5.0.0-beta5.2" />
     <PackageReference Update="ReportGenerator" Version="4.2.5" />
   </ItemGroup>
   <ItemGroup>
@@ -28,4 +28,4 @@
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageReference Update="XunitXml.TestLogger" Version="2.1.26" />
   </ItemGroup>
-</Project>
+</Project>