Skip to content

Commit a47dce0

Browse files
SuperJMNSuperJMN
committed
Remove duplicate test projects and move them to the correct folder
1 parent 4363491 commit a47dce0

File tree

306 files changed

+50
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

306 files changed

+50
-83
lines changed

‎DotnetPackaging.sln‎

Lines changed: 29 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetPackaging.Deb", "src\
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetPackaging.AppImage", "src\DotnetPackaging.AppImage\DotnetPackaging.AppImage.csproj", "{1CEF57FA-1EBA-48A6-8A1E-CD41DB04DD38}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Msix.Tests", "src\DotnetPackaging.Msix.Tests\DotnetPackaging.Msix.Tests.csproj", "{79928283-5F6E-49F4-ACC4-FE5994DA1116}"
13-
EndProject
1412
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Msix", "src\DotnetPackaging.Msix\DotnetPackaging.Msix.csproj", "{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}"
1513
EndProject
1614
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other files", "Other files", "{62D724AD-1161-4EE3-AC71-9FFA01690F75}"
@@ -23,8 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other files", "Other files"
2321
EndProject
2422
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}"
2523
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Exe.E2E.Tests", "test\DotnetPackaging.Exe.Tests\DotnetPackaging.Exe.Tests.csproj", "{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}"
27-
EndProject
2824
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Tool", "src\DotnetPackaging.Tool\DotnetPackaging.Tool.csproj", "{C11DE8FE-8C40-44AF-BD71-50F507291E42}"
2925
EndProject
3026
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Rpm", "src\DotnetPackaging.Rpm\DotnetPackaging.Rpm.csproj", "{62BDA166-63D6-4B38-B146-A868A392C5FC}"
@@ -43,7 +39,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.AppImage.Te
4339
EndProject
4440
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Dmg.Tests", "test\DotnetPackaging.Dmg.Tests\DotnetPackaging.Dmg.Tests.csproj", "{D97A5E33-6621-44DD-83D0-65F55F56E487}"
4541
EndProject
46-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Exe.Tests", "src\DotnetPackaging.Exe.Tests\DotnetPackaging.Exe.Tests.csproj", "{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}"
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Msix.Tests", "test\DotnetPackaging.Msix.Tests\DotnetPackaging.Msix.Tests.csproj", "{DD050A6C-D84F-47AC-8453-18A57F751587}"
43+
EndProject
44+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotnetPackaging.Exe.Tests", "test\DotnetPackaging.Exe.Tests\DotnetPackaging.Exe.Tests.csproj", "{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}"
4745
EndProject
4846
Global
4947
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -91,18 +89,6 @@ Global
9189
{1CEF57FA-1EBA-48A6-8A1E-CD41DB04DD38}.Release|x64.Build.0 = Release|Any CPU
9290
{1CEF57FA-1EBA-48A6-8A1E-CD41DB04DD38}.Release|x86.ActiveCfg = Release|Any CPU
9391
{1CEF57FA-1EBA-48A6-8A1E-CD41DB04DD38}.Release|x86.Build.0 = Release|Any CPU
94-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|Any CPU.Build.0 = Debug|Any CPU
96-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|x64.ActiveCfg = Debug|Any CPU
97-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|x64.Build.0 = Debug|Any CPU
98-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|x86.ActiveCfg = Debug|Any CPU
99-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Debug|x86.Build.0 = Debug|Any CPU
100-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|Any CPU.ActiveCfg = Release|Any CPU
101-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|Any CPU.Build.0 = Release|Any CPU
102-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|x64.ActiveCfg = Release|Any CPU
103-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|x64.Build.0 = Release|Any CPU
104-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|x86.ActiveCfg = Release|Any CPU
105-
{79928283-5F6E-49F4-ACC4-FE5994DA1116}.Release|x86.Build.0 = Release|Any CPU
10692
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10793
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Debug|Any CPU.Build.0 = Debug|Any CPU
10894
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -115,18 +101,6 @@ Global
115101
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Release|x64.Build.0 = Release|Any CPU
116102
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Release|x86.ActiveCfg = Release|Any CPU
117103
{EDCAB7CC-741C-4DB0-95B8-F9CB1D89B475}.Release|x86.Build.0 = Release|Any CPU
118-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
120-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|x64.ActiveCfg = Debug|Any CPU
121-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|x64.Build.0 = Debug|Any CPU
122-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|x86.ActiveCfg = Debug|Any CPU
123-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Debug|x86.Build.0 = Debug|Any CPU
124-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
125-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|Any CPU.Build.0 = Release|Any CPU
126-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|x64.ActiveCfg = Release|Any CPU
127-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|x64.Build.0 = Release|Any CPU
128-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|x86.ActiveCfg = Release|Any CPU
129-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D}.Release|x86.Build.0 = Release|Any CPU
130104
{C11DE8FE-8C40-44AF-BD71-50F507291E42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131105
{C11DE8FE-8C40-44AF-BD71-50F507291E42}.Debug|Any CPU.Build.0 = Debug|Any CPU
132106
{C11DE8FE-8C40-44AF-BD71-50F507291E42}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -235,29 +209,40 @@ Global
235209
{D97A5E33-6621-44DD-83D0-65F55F56E487}.Release|x64.Build.0 = Release|Any CPU
236210
{D97A5E33-6621-44DD-83D0-65F55F56E487}.Release|x86.ActiveCfg = Release|Any CPU
237211
{D97A5E33-6621-44DD-83D0-65F55F56E487}.Release|x86.Build.0 = Release|Any CPU
238-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
239-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
240-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|x64.ActiveCfg = Debug|Any CPU
241-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|x64.Build.0 = Debug|Any CPU
242-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|x86.ActiveCfg = Debug|Any CPU
243-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Debug|x86.Build.0 = Debug|Any CPU
244-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
245-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|Any CPU.Build.0 = Release|Any CPU
246-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|x64.ActiveCfg = Release|Any CPU
247-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|x64.Build.0 = Release|Any CPU
248-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|x86.ActiveCfg = Release|Any CPU
249-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD}.Release|x86.Build.0 = Release|Any CPU
212+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
213+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|Any CPU.Build.0 = Debug|Any CPU
214+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|x64.ActiveCfg = Debug|Any CPU
215+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|x64.Build.0 = Debug|Any CPU
216+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|x86.ActiveCfg = Debug|Any CPU
217+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Debug|x86.Build.0 = Debug|Any CPU
218+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|Any CPU.ActiveCfg = Release|Any CPU
219+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|Any CPU.Build.0 = Release|Any CPU
220+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|x64.ActiveCfg = Release|Any CPU
221+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|x64.Build.0 = Release|Any CPU
222+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|x86.ActiveCfg = Release|Any CPU
223+
{DD050A6C-D84F-47AC-8453-18A57F751587}.Release|x86.Build.0 = Release|Any CPU
224+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
225+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
226+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|x64.ActiveCfg = Debug|Any CPU
227+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|x64.Build.0 = Debug|Any CPU
228+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|x86.ActiveCfg = Debug|Any CPU
229+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Debug|x86.Build.0 = Debug|Any CPU
230+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
231+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|Any CPU.Build.0 = Release|Any CPU
232+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|x64.ActiveCfg = Release|Any CPU
233+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|x64.Build.0 = Release|Any CPU
234+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|x86.ActiveCfg = Release|Any CPU
235+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB}.Release|x86.Build.0 = Release|Any CPU
250236
EndGlobalSection
251237
GlobalSection(SolutionProperties) = preSolution
252238
HideSolutionNode = FALSE
253239
EndGlobalSection
254240
GlobalSection(NestedProjects) = preSolution
255-
{79928283-5F6E-49F4-ACC4-FE5994DA1116} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
256-
{6F3C5C5A-61E4-4D16-BE0D-6A0E9E9B3F9D} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
257241
{F090C5BD-3B1C-4D32-93AD-5D90E4819A69} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
258242
{2BD66C13-3A2A-45B5-9E36-F25F77292B10} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
259243
{D97A5E33-6621-44DD-83D0-65F55F56E487} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
260-
{4AA3D5C2-1C8D-4E3A-901A-07E2FDAE59BD} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
244+
{DD050A6C-D84F-47AC-8453-18A57F751587} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
245+
{C9B6586A-332B-40B0-9F2B-BBFFD7F5CFCB} = {7E0C2A39-1C29-4B5D-9D45-1B6B7E7A77B6}
261246
EndGlobalSection
262247
GlobalSection(ExtensibilityGlobals) = postSolution
263248
SolutionGuid = {1D869DF1-9147-472D-A3D9-D519518A6951}

‎src/DotnetPackaging.Exe.Tests/DotnetPackaging.Exe.Tests.csproj‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎test/DotnetPackaging.Exe.Tests/DotnetPackaging.Exe.Tests.csproj‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
4-
<IsPackable>false</IsPackable>
4+
<TargetFramework>net8.0-windows</TargetFramework>
5+
<EnableWindowsTargeting>true</EnableWindowsTargeting>
6+
<ImplicitUsings>enable</ImplicitUsings>
57
<Nullable>enable</Nullable>
6-
<AssemblyName>DotnetPackaging.Exe.E2E.Tests</AssemblyName>
7-
<RootNamespace>DotnetPackaging.Exe.E2E.Tests</RootNamespace>
8+
<IsPackable>false</IsPackable>
9+
<!-- Tests exercise the Windows-only installer stub (WinExe + Registry), so they must target Windows. -->
810
</PropertyGroup>
11+
912
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1113
<PackageReference Include="FluentAssertions" />
14+
<PackageReference Include="coverlet.collector" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1216
<PackageReference Include="xunit" />
13-
<PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
17+
<PackageReference Include="xunit.runner.visualstudio" />
18+
<PackageReference Include="Xunit.SkippableFact" />
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<Using Include="Xunit" />
1423
</ItemGroup>
24+
1525
<ItemGroup>
26+
<ProjectReference Include="..\..\src\DotnetPackaging.Exe.Installer\DotnetPackaging.Exe.Installer.csproj" />
1627
<ProjectReference Include="..\..\src\DotnetPackaging.Exe\DotnetPackaging.Exe.csproj" />
1728
</ItemGroup>
18-
</Project>
29+
30+
</Project>

‎src/DotnetPackaging.Exe.Tests/SimpleExePackerTests.cs‎ renamed to ‎test/DotnetPackaging.Exe.Tests/SimpleExePackerTests.cs‎

File renamed without changes.

‎src/DotnetPackaging.Msix.Tests/CompressionTests.cs‎ renamed to ‎test/DotnetPackaging.Msix.Tests/CompressionTests.cs‎

File renamed without changes.

‎src/DotnetPackaging.Msix.Tests/DotnetPackaging.Msix.Tests.csproj‎ renamed to ‎test/DotnetPackaging.Msix.Tests/DotnetPackaging.Msix.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</ItemGroup>
2424

2525
<ItemGroup>
26-
<ProjectReference Include="..\DotnetPackaging.Msix\DotnetPackaging.Msix.csproj"/>
26+
<ProjectReference Include="..\..\src\DotnetPackaging.Msix\DotnetPackaging.Msix.csproj" />
2727
</ItemGroup>
2828

2929
</Project>

0 commit comments

Comments
 (0)