Merge pull request #1002 from TestCentric/update-script

Clean up csproj files
TestCentric · Oct 22, 2023 · 62a6e29 · 62a6e29
2 parents 92453bd + 911768a
commit 62a6e29
Show file tree

Hide file tree

Showing 7 changed files with 198 additions and 189 deletions.
diff --git a/build.cake b/build.cake
@@ -76,8 +76,6 @@ var nugetPackage = new NuGetPackage(
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
 				"testcentric.engine.pdb", "../../nuget/testcentric.nuget.addins"),
-			new DirectoryContent("tools/Images").WithFiles(
-				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
 				"Images/Tree/Circles/Success.jpg", "Images/Tree/Circles/Failure.jpg", "Images/Tree/Circles/Ignored.jpg", "Images/Tree/Circles/Inconclusive.jpg", "Images/Tree/Circles/Skipped.jpg"),
 			new DirectoryContent("tools/Images/Tree/Classic").WithFiles(
@@ -95,7 +93,6 @@ var nugetPackage = new NuGetPackage(
 	checks: new PackageCheck[] {
 		HasFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "testcentric.png"),
 		HasDirectory("tools").WithFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.nuget.addins"),
-		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
 		HasDirectory("tools/Images/Tree/Circles").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Classic").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Default").WithFiles(TREE_ICONS_PNG),
@@ -118,8 +115,6 @@ var chocolateyPackage = new ChocolateyPackage(
 				"testcentric.engine.dll", "testcentric.engine.core.dll", "testcentric.engine.api.dll", "TestCentric.InternalTrace.dll",
 				"testcentric.engine.metadata.dll", "testcentric.extensibility.dll", "testcentric.extensibility.api.dll",
 				"testcentric.engine.pdb", "../../choco/testcentric.choco.addins"),
-			new DirectoryContent("tools/Images").WithFiles(
-				"Images/DebugTests.png", "Images/RunTests.png", "Images/StopRun.png", "Images/GroupBy_16x.png", "Images/SummaryReport.png"),
 			new DirectoryContent("tools/Images/Tree/Circles").WithFiles(
 				"Images/Tree/Circles/Success.jpg", "Images/Tree/Circles/Failure.jpg", "Images/Tree/Circles/Ignored.jpg", "Images/Tree/Circles/Inconclusive.jpg", "Images/Tree/Circles/Skipped.jpg"),
 			new DirectoryContent("tools/Images/Tree/Classic").WithFiles(
@@ -136,7 +131,6 @@ var chocolateyPackage = new ChocolateyPackage(
 	testRunner: new GuiSelfTester(BuildSettings.ChocolateyTestDirectory + "testcentric-gui/tools/testcentric.exe"),
 	checks: new PackageCheck[] {
 		HasDirectory("tools").WithFiles("CHANGES.txt", "LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "testcentric.choco.addins").AndFiles(GUI_FILES).AndFiles(ENGINE_FILES).AndFile("testcentric.choco.addins"),
-		HasDirectory("tools/Images").WithFiles("DebugTests.png", "RunTests.png", "StopRun.png", "GroupBy_16x.png", "SummaryReport.png"),
 		HasDirectory("tools/Images/Tree/Circles").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Classic").WithFiles(TREE_ICONS_JPG),
 		HasDirectory("tools/Images/Tree/Default").WithFiles(TREE_ICONS_PNG),

diff --git a/src/GuiException/UiException/nunit.uiexception.dll.csproj b/src/GuiException/UiException/nunit.uiexception.dll.csproj
@@ -1,18 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>NUnit.UiException</RootNamespace>
-    <AssemblyName>nunit.uiexception</AssemblyName>
-    <TargetFramework>net462</TargetFramework>
-    <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\testcentric.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="data\TextCode.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
+
+    <PropertyGroup>
+        <RootNamespace>NUnit.UiException</RootNamespace>
+        <AssemblyName>nunit.uiexception</AssemblyName>
+        <TargetFramework>net462</TargetFramework>
+        <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>..\..\testcentric.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Remove="data\TextCode.cs" />
+    </ItemGroup>
+
+	<ItemGroup>
+        <Reference Include="System.Windows.Forms" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/GuiException/tests/nunit.uiexception.tests.csproj b/src/GuiException/tests/nunit.uiexception.tests.csproj
@@ -1,31 +1,38 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RootNamespace>NUnit.UiException.Tests</RootNamespace>
-    <AssemblyName>nunit.uiexception.tests</AssemblyName>
-	<OutputType>Exe</OutputType>
-	<TargetFramework>net462</TargetFramework>
-    <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\UiException\nunit.uiexception.dll.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="data\Basic.cs" />
-    <EmbeddedResource Include="data\HelloWorld.txt" />
-    <EmbeddedResource Include="data\TextCode.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="4.0.0" />
-	  <PackageReference Include="NUnit" Version="3.13.2" />
-	  <PackageReference Include="NUnitLite" Version="3.13.2" />
-	  <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
-  </ItemGroup>
+
+	<PropertyGroup>
+        <RootNamespace>NUnit.UiException.Tests</RootNamespace>
+        <AssemblyName>nunit.uiexception.tests</AssemblyName>
+	    <OutputType>Exe</OutputType>
+	    <TargetFramework>net462</TargetFramework>
+        <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
+        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    </PropertyGroup>
+
+	<ItemGroup>
+        <Reference Include="System.Windows.Forms" />
+    </ItemGroup>
+
+	<ItemGroup>
+        <ProjectReference Include="..\UiException\nunit.uiexception.dll.csproj" />
+    </ItemGroup>
+
+	<ItemGroup>
+        <EmbeddedResource Include="data\Basic.cs" />
+        <EmbeddedResource Include="data\HelloWorld.txt" />
+        <EmbeddedResource Include="data\TextCode.txt" />
+    </ItemGroup>
+
+	<ItemGroup>
+        <None Include="app.config" />
+    </ItemGroup>
+
+	<ItemGroup>
+        <PackageReference Include="NSubstitute" Version="4.0.0" />
+	    <PackageReference Include="NUnit" Version="3.13.2" />
+	    <PackageReference Include="NUnitLite" Version="3.13.2" />
+	    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj b/src/TestCentric/testcentric.exe/TestCentric.Gui.Exe.csproj
@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
 		<RootNamespace>TestCentric.Gui</RootNamespace>
@@ -7,23 +8,26 @@
 		<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <AssemblyTitle>TestCentric Runner</AssemblyTitle>
-    <Description>GUI Runner Executable</Description>
-  </PropertyGroup>
+        <AssemblyTitle>TestCentric Runner</AssemblyTitle>
+        <Description>GUI Runner Executable</Description>
+    </PropertyGroup>
+
 	<ItemGroup>
 		<Reference Include="System.Windows.Forms" />
 	</ItemGroup>
-    <PropertyGroup>
+
+	<PropertyGroup>
         <ApplicationIcon>..\..\..\testcentric.ico</ApplicationIcon>
     </PropertyGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj">
-            <Name>TestCentric.Gui</Name>
-        </ProjectReference>
+
+	<ItemGroup>
+        <ProjectReference Include="..\testcentric.gui\TestCentric.Gui.csproj" />
     </ItemGroup>
-    <ItemGroup>
+
+	<ItemGroup>
         <Content Include="..\..\..\testcentric.ico">
             <Link>testcentric.ico</Link>
         </Content>
     </ItemGroup>
+
 </Project>