Skip to content

Commit 3240d54

Browse files
albertospeltaalbertospelta
authored
Refactor solution files and add test utils solution (#134)
Refactored the Visual Studio solution files for the VertiPaq-Analyzer project: - Removed "Utils" projects from VertiPaq-Analyzer.sln - Removed VertiPaq-Analyzer.slnf - Added VertiPaq-Analyzer-WithTestUtils.sln to include "Utils" project and sub-projects. - Update CI/CD and build scripts to use .sln instead of .slnf
1 parent 03e8c2c commit 3240d54

File tree

6 files changed

+111
-59
lines changed

6 files changed

+111
-59
lines changed

‎.azure/pipelines/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -58,26 +58,26 @@ steps:
5858
displayName: '.NET restore'
5959
inputs:
6060
command: 'restore'
61-
projects: 'VertiPaq-Analyzer.slnf'
61+
projects: 'VertiPaq-Analyzer.sln'
6262
feedsToUse: 'select'
6363
verbosityRestore: '${{ parameters.verbosity }}'
6464
- task: DotNetCoreCLI@2
6565
displayName: '.NET build'
6666
inputs:
6767
command: 'build'
68-
projects: 'VertiPaq-Analyzer.slnf'
68+
projects: 'VertiPaq-Analyzer.sln'
6969
arguments: '--configuration "$(configuration)" --no-restore --verbosity ${{ parameters.verbosity }} /p:AssemblyVersion="$(assemblyVersion)" /p:FileVersion="$(semanticVersion)" /p:VersionPrefix="$(semanticVersion)" /p:VersionSuffix="$(versionSuffix)" /p:ContinuousIntegrationBuild="true" /p:AdditionalConstants="SIGNED" /p:SignAssembly="true" /p:AssemblyOriginatorKeyFile="$(signKey.secureFilePath)" /m'
7070
- task: DotNetCoreCLI@2
7171
displayName: '.NET test'
7272
inputs:
7373
command: 'test'
74-
projects: 'VertiPaq-Analyzer.slnf'
74+
projects: 'VertiPaq-Analyzer.sln'
7575
arguments: '--no-restore --no-build --verbosity ${{ parameters.verbosity }} --logger "trx;LogFilePrefix=testResults" --collect "Code coverage"'
7676
- task: DotNetCoreCLI@2
7777
displayName: '.NET pack'
7878
inputs:
7979
command: 'pack'
80-
packagesToPack: 'VertiPaq-Analyzer.slnf'
80+
packagesToPack: 'VertiPaq-Analyzer.sln'
8181
nobuild: true
8282
versioningScheme: 'byEnvVar'
8383
versionEnvVar: 'packageVersion'

‎.github/workflows/ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
6.0.x
2626
global-json-file: global.json
2727
- name: restore
28-
run: dotnet restore VertiPaq-Analyzer.slnf
28+
run: dotnet restore VertiPaq-Analyzer.sln
2929
- name: build
30-
run: dotnet build VertiPaq-Analyzer.slnf --configuration Release --no-restore
30+
run: dotnet build VertiPaq-Analyzer.sln --configuration Release --no-restore
3131
- name: test
32-
run: dotnet test VertiPaq-Analyzer.slnf --configuration Release --no-build --verbosity normal
32+
run: dotnet test VertiPaq-Analyzer.sln --configuration Release --no-build --verbosity normal
3333
- name: pack
34-
run: dotnet pack VertiPaq-Analyzer.slnf --configuration Release --no-build --no-restore --verbosity normal
34+
run: dotnet pack VertiPaq-Analyzer.sln --configuration Release --no-build --no-restore --verbosity normal

‎VertiPaq-Analyzer.sln

-32
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.1.32414.318
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}"
7-
EndProject
86
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata", "src\Dax.Metadata\Dax.Metadata.csproj", "{58943FC4-75D3-4435-A51E-CAEFE1E69FAA}"
97
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor", "src\Dax.Model.Extractor\Dax.Model.Extractor.csproj", "{CA1BF698-7BD1-4529-A36D-E9DBA5BE4B8D}"
@@ -21,14 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests",
2119
EndProject
2220
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "src\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}"
2321
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDaxModel", "utils\TestDaxModel\TestDaxModel.csproj", "{05F7D96E-0910-48FE-9F2E-205A079C4760}"
25-
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDaxWpf", "utils\TestDaxWpf\TestDaxWpf.csproj", "{49931A12-0090-4533-9805-9A317A099985}"
27-
EndProject
28-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPowerBI", "utils\TestPowerBI\TestPowerBI.csproj", "{41C00525-D3EA-403D-B1BF-4055244F57C9}"
29-
EndProject
30-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWpfPowerBI", "utils\TestWpfPowerBI\TestWpfPowerBI.csproj", "{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}"
31-
EndProject
3222
Global
3323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3424
Debug|Any CPU = Debug|Any CPU
@@ -67,32 +57,10 @@ Global
6757
{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
6858
{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
6959
{CF873E93-AE2F-4A25-A71C-A68EB876C7A0}.Release|Any CPU.Build.0 = Release|Any CPU
70-
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71-
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Debug|Any CPU.Build.0 = Debug|Any CPU
72-
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Release|Any CPU.ActiveCfg = Release|Any CPU
73-
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Release|Any CPU.Build.0 = Release|Any CPU
74-
{49931A12-0090-4533-9805-9A317A099985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75-
{49931A12-0090-4533-9805-9A317A099985}.Debug|Any CPU.Build.0 = Debug|Any CPU
76-
{49931A12-0090-4533-9805-9A317A099985}.Release|Any CPU.ActiveCfg = Release|Any CPU
77-
{49931A12-0090-4533-9805-9A317A099985}.Release|Any CPU.Build.0 = Release|Any CPU
78-
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79-
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
80-
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
81-
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Release|Any CPU.Build.0 = Release|Any CPU
82-
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83-
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Debug|Any CPU.Build.0 = Debug|Any CPU
84-
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Release|Any CPU.ActiveCfg = Release|Any CPU
85-
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Release|Any CPU.Build.0 = Release|Any CPU
8660
EndGlobalSection
8761
GlobalSection(SolutionProperties) = preSolution
8862
HideSolutionNode = FALSE
8963
EndGlobalSection
90-
GlobalSection(NestedProjects) = preSolution
91-
{05F7D96E-0910-48FE-9F2E-205A079C4760} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
92-
{49931A12-0090-4533-9805-9A317A099985} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
93-
{41C00525-D3EA-403D-B1BF-4055244F57C9} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
94-
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
95-
EndGlobalSection
9664
GlobalSection(ExtensibilityGlobals) = postSolution
9765
SolutionGuid = {BF417AA2-7521-408B-A3F5-A20CC760AE6E}
9866
EndGlobalSection

‎VertiPaq-Analyzer.slnf

-15
This file was deleted.

‎build.cmd

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@ECHO OFF
22
SETLOCAL
33

4-
dotnet restore VertiPaq-Analyzer.slnf || GOTO :error
5-
dotnet build VertiPaq-Analyzer.slnf || GOTO :error
6-
dotnet test VertiPaq-Analyzer.slnf || GOTO :error
7-
dotnet pack VertiPaq-Analyzer.slnf || GOTO :error
4+
dotnet restore VertiPaq-Analyzer.sln || GOTO :error
5+
dotnet build VertiPaq-Analyzer.sln || GOTO :error
6+
dotnet test VertiPaq-Analyzer.sln || GOTO :error
7+
dotnet pack VertiPaq-Analyzer.sln || GOTO :error
88

99
GOTO :EOF
1010
:error

‎utils/VertiPaq-Analyzer-WithTestUtils.sln

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32414.318
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDaxModel", "TestDaxModel\TestDaxModel.csproj", "{05F7D96E-0910-48FE-9F2E-205A079C4760}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestDaxWpf", "TestDaxWpf\TestDaxWpf.csproj", "{49931A12-0090-4533-9805-9A317A099985}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestPowerBI", "TestPowerBI\TestPowerBI.csproj", "{41C00525-D3EA-403D-B1BF-4055244F57C9}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWpfPowerBI", "TestWpfPowerBI\TestWpfPowerBI.csproj", "{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata", "..\src\Dax.Metadata\Dax.Metadata.csproj", "{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Metadata.Tests", "..\src\Dax.Metadata.Tests\Dax.Metadata.Tests.csproj", "{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor", "..\src\Dax.Model.Extractor\Dax.Model.Extractor.csproj", "{1E17B04F-9FCB-459A-9368-78639ED37FD4}"
21+
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Model.Extractor.Tests", "..\src\Dax.Model.Extractor.Tests\Dax.Model.Extractor.Tests.csproj", "{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.ViewModel", "..\src\Dax.ViewModel\Dax.ViewModel.csproj", "{E7571992-F457-4683-846F-B7C0CAA1BFC5}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.ViewVpaExport", "..\src\Dax.ViewVpaExport\Dax.ViewVpaExport.csproj", "{1B52EDBC-4E37-453A-AE88-94153C3396E7}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax", "..\src\Dax.Vpax\Dax.Vpax.csproj", "{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dax.Vpax.Tests", "..\src\Dax.Vpax.Tests\Dax.Vpax.Tests.csproj", "{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}"
31+
EndProject
32+
Global
33+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
34+
Debug|Any CPU = Debug|Any CPU
35+
Release|Any CPU = Release|Any CPU
36+
EndGlobalSection
37+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
38+
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
39+
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Debug|Any CPU.Build.0 = Debug|Any CPU
40+
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Release|Any CPU.ActiveCfg = Release|Any CPU
41+
{05F7D96E-0910-48FE-9F2E-205A079C4760}.Release|Any CPU.Build.0 = Release|Any CPU
42+
{49931A12-0090-4533-9805-9A317A099985}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{49931A12-0090-4533-9805-9A317A099985}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{49931A12-0090-4533-9805-9A317A099985}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{49931A12-0090-4533-9805-9A317A099985}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{41C00525-D3EA-403D-B1BF-4055244F57C9}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{E6041BDA-DCA0-4EF4-85CE-799BD763D5FA}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{4E775D58-05B1-4FDE-A25C-001A3B5D1B8B}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{1E17B04F-9FCB-459A-9368-78639ED37FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{1E17B04F-9FCB-459A-9368-78639ED37FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{1E17B04F-9FCB-459A-9368-78639ED37FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{1E17B04F-9FCB-459A-9368-78639ED37FD4}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{416BA3AB-6CD4-4167-AD5A-EC4CC657E606}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{E7571992-F457-4683-846F-B7C0CAA1BFC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{E7571992-F457-4683-846F-B7C0CAA1BFC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{E7571992-F457-4683-846F-B7C0CAA1BFC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{E7571992-F457-4683-846F-B7C0CAA1BFC5}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{1B52EDBC-4E37-453A-AE88-94153C3396E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{1B52EDBC-4E37-453A-AE88-94153C3396E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{1B52EDBC-4E37-453A-AE88-94153C3396E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{1B52EDBC-4E37-453A-AE88-94153C3396E7}.Release|Any CPU.Build.0 = Release|Any CPU
78+
{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
79+
{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}.Debug|Any CPU.Build.0 = Debug|Any CPU
80+
{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}.Release|Any CPU.ActiveCfg = Release|Any CPU
81+
{7ED1E91E-D9E9-4C13-926F-4BD0BFE63615}.Release|Any CPU.Build.0 = Release|Any CPU
82+
{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83+
{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}.Debug|Any CPU.Build.0 = Debug|Any CPU
84+
{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}.Release|Any CPU.ActiveCfg = Release|Any CPU
85+
{E06BCFE7-479F-4208-B6E8-2CC7A4B1D738}.Release|Any CPU.Build.0 = Release|Any CPU
86+
EndGlobalSection
87+
GlobalSection(SolutionProperties) = preSolution
88+
HideSolutionNode = FALSE
89+
EndGlobalSection
90+
GlobalSection(NestedProjects) = preSolution
91+
{05F7D96E-0910-48FE-9F2E-205A079C4760} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
92+
{49931A12-0090-4533-9805-9A317A099985} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
93+
{41C00525-D3EA-403D-B1BF-4055244F57C9} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
94+
{F40F1ED3-FF9C-4C6F-AE86-6E9DAD6DD122} = {1F7A4D70-8CF0-4EE7-8E5B-053C09F4CA4A}
95+
EndGlobalSection
96+
GlobalSection(ExtensibilityGlobals) = postSolution
97+
SolutionGuid = {BF417AA2-7521-408B-A3F5-A20CC760AE6E}
98+
EndGlobalSection
99+
EndGlobal

0 commit comments

Comments
 (0)