Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 5b60b47

Browse files
Priya91Priya91
committed
Merge pull request #2540 from Priya91/fileversioninfo
Reorganize System.Diagnostics.FileVersionInfo tests folder structure.
2 parents 2678fc7 + 374274d commit 5b60b47

File tree

13 files changed

+37
-33
lines changed

13 files changed

+37
-33
lines changed

‎src/System.Diagnostics.FileVersionInfo/System.Diagnostics.FileVersionInfo.sln

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,33 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30723.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.22609.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo", "src\System.Diagnostics.FileVersionInfo.csproj", "{00EDA5FD-E802-40D3-92D5-56C27612D36D}"
97
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{E89555F6-03BA-4E34-B6A7-0454CE173581}"
11-
EndProject
12-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssembly", "TestAssembly", "{A850245D-C81C-47FF-AFFA-FA4F92B7D4D9}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "testAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}"
15-
EndProject
168
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2D0715BD-01EA-4E9D-AC88-DA5410C15183}"
179
ProjectSection(SolutionItems) = preProject
1810
..\.nuget\packages.Windows_NT.config = ..\.nuget\packages.Windows_NT.config
1911
EndProjectSection
2012
EndProject
13+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.Tests", "tests\System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj", "{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}"
14+
EndProject
15+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Diagnostics.FileVersionInfo.TestAssembly", "tests\System.Diagnostics.FileVersionInfo.TestAssembly\System.Diagnostics.FileVersionInfo.TestAssembly.csproj", "{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}"
16+
EndProject
2117
Global
2218
GlobalSection(SolutionConfigurationPlatforms) = preSolution
19+
Debug|Any CPU = Debug|Any CPU
2320
Linux_Debug|Any CPU = Linux_Debug|Any CPU
2421
Linux_Release|Any CPU = Linux_Release|Any CPU
2522
OSX_Debug|Any CPU = OSX_Debug|Any CPU
2623
OSX_Release|Any CPU = OSX_Release|Any CPU
24+
Release|Any CPU = Release|Any CPU
2725
Windows_Debug|Any CPU = Windows_Debug|Any CPU
2826
Windows_Release|Any CPU = Windows_Release|Any CPU
2927
EndGlobalSection
3028
GlobalSection(ProjectConfigurationPlatforms) = postSolution
31-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Release|Any CPU.Build.0 = Release|Any CPU
35-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
39-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
29+
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
30+
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
4331
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Linux_Debug|Any CPU.ActiveCfg = Linux_Debug|Any CPU
4432
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Linux_Debug|Any CPU.Build.0 = Linux_Debug|Any CPU
4533
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Linux_Release|Any CPU.ActiveCfg = Linux_Release|Any CPU
@@ -48,10 +36,30 @@ Global
4836
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|Any CPU
4937
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|Any CPU
5038
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.OSX_Release|Any CPU.Build.0 = OSX_Release|Any CPU
39+
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
40+
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Release|Any CPU.Build.0 = Windows_Release|Any CPU
5141
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|Any CPU
5242
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|Any CPU
5343
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|Any CPU
5444
{00EDA5FD-E802-40D3-92D5-56C27612D36D}.Windows_Release|Any CPU.Build.0 = Windows_Release|Any CPU
45+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
49+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Linux_Release|Any CPU.Build.0 = Release|Any CPU
51+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
55+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
61+
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
5563
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU
5664
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU
5765
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,6 +68,8 @@ Global
6068
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
6169
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
6270
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
71+
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
72+
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Release|Any CPU.Build.0 = Release|Any CPU
6373
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
6474
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
6575
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -68,8 +78,4 @@ Global
6878
GlobalSection(SolutionProperties) = preSolution
6979
HideSolutionNode = FALSE
7080
EndGlobalSection
71-
GlobalSection(NestedProjects) = preSolution
72-
{6DFDB760-CC88-48AE-BD81-C64844EA3CBC} = {E89555F6-03BA-4E34-B6A7-0454CE173581}
73-
{28EB14BE-3BC9-4543-ABA6-A932424DFBD0} = {A850245D-C81C-47FF-AFFA-FA4F92B7D4D9}
74-
EndGlobalSection
7581
EndGlobal

‎src/System.Diagnostics.FileVersionInfo/testAssembly/Assembly1.cs renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/Assembly1.cs

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/testAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/System.Diagnostics.FileVersionInfo.TestAssembly.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1313
</PropertyGroup>
1414
<!-- Default configurations to help VS understand the configurations -->
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
1917
<!-- Compiled Source Files -->
2018
<ItemGroup>
2119
<Compile Include="Assembly1.cs" />

‎src/System.Diagnostics.FileVersionInfo/testAssembly/project.json renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/project.json

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/testAssembly/project.lock.json renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.TestAssembly/project.lock.json

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/tests/FileVersionInfoTest.cs renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/FileVersionInfoTest.cs

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/tests/Interop/Interop.Windows.cs renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/Interop/Interop.Windows.cs

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/tests/NativeConsoleApp.exe renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/NativeConsoleApp.exe

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/tests/NativeLibrary.dll renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/NativeLibrary.dll

File renamed without changes.

‎src/System.Diagnostics.FileVersionInfo/tests/SecondNativeLibrary.dll renamed to ‎src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests/SecondNativeLibrary.dll

File renamed without changes.

0 commit comments

Comments
 (0)