Skip to content

Commit cfd425d

Browse files
vnovesvnoves
authored
Merge pull request #73 from EverseDevelopment/develop
comments resolved and bundle 2024 added
2 parents 6398474 + 835cad2 commit cfd425d

File tree

33 files changed

+1206
-415
lines changed

33 files changed

+1206
-415
lines changed

‎.github/workflows/dev_actions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# The type of runner that the job will run on
1313
runs-on: windows-latest
1414
env:
15-
Solution_Name: e-verse.Navisworks.ViewpointByLevel.sln
15+
Solution_Name: Veronica.ViewpointByLevel.sln
1616
outputs:
1717
Version: ${{ steps.gitversion.outputs.nuGetVersionV2 }}
1818
CommitsSinceVersionSource: ${{ steps.gitversion.outputs.CommitsSinceVersionSource }}

‎.github/workflows/production_actions.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
# The type of runner that the job will run on
1111
runs-on: windows-latest
1212
env:
13-
Solution_Name: e-verse.Navisworks.ViewpointByLevel.sln
13+
Solution_Name: Veronica.ViewpointByLevel.sln
1414
outputs:
1515
Version: ${{ steps.gitversion.outputs.nuGetVersionV2 }}
1616
CommitsSinceVersionSource: ${{ steps.gitversion.outputs.CommitsSinceVersionSource }}
@@ -49,15 +49,15 @@ jobs:
4949
uses: NuGet/setup-nuget@v1.0.6
5050

5151
- name: Restore NuGet Packages
52-
run: nuget restore e-verse.Navisworks.ViewpointByLevel.sln
52+
run: nuget restore Veronica.ViewpointByLevel.sln
5353

5454
# Change the version inside of the 'e-verse.Navisworks.ViewpointByLevel.Installer.g.wxs' file
5555
- name: Setting new version to the 'e-verse.Navisworks.ViewpointByLevel.Installer.g.wxs' file
5656
run: (Get-Content e-verse.Navisworks.ViewpointByLevel.Installer/wix/e-verse.Navisworks.ViewpointByLevel.Installer.g.wxs) -replace 'Version="1.0.0"', 'Version="${{ steps.gitversion.outputs.majorMinorPatch }}"' | Out-File -encoding ASCII e-verse.Navisworks.ViewpointByLevel.Installer/wix/e-verse.Navisworks.ViewpointByLevel.Installer.g.wxs
5757

5858
# Build the solution on the Release mode
5959
- name: Build and Publish App
60-
run: msbuild e-verse.Navisworks.ViewpointByLevel.sln /t:Clean,Build /p:platform="Any CPU" /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile
60+
run: msbuild Veronica.ViewpointByLevel.sln /t:Clean,Build /p:platform="Any CPU" /p:Configuration=Release /p:DeployOnBuild=true /p:PublishProfile=FolderProfile
6161

6262
- name: Create Release
6363
id: create_release
@@ -77,6 +77,6 @@ jobs:
7777
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7878
with:
7979
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
80-
asset_path: .\e-verse.Navisworks.ViewpointByLevel.Installer\e-verse.Navisworks.ViewpointByLevel.exe
81-
asset_name: e-verse.Navisworks.ViewpointByLevel.exe
80+
asset_path: .\e-verse.Navisworks.ViewpointByLevel.Installer\Veronica.ViewpointByLevel.exe
81+
asset_name: Veronica.ViewpointByLevel.exe
8282
asset_content_type: application/zip

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,3 +371,4 @@ FodyWeavers.xsd
371371
Veronica.ViewpointByLevel.bundle/
372372

373373
Veronica.ViewpointByLevel.bundle.zip
374+
*.exe

‎GitVersion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#GitVersion.yml
22

33
mode: ContinuousDeployment
4-
next-version: 1.0.0
4+
next-version: 1.0.20

‎Veronica.ViewpointByLevel.sln‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,16 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "e-verse.Navisworks.ViewpointByLevel.Common", "e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.shproj", "{0E931C02-2355-451E-97B5-7F43FF8D2145}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2022", "e-verse.Navisworks.ViewpointByLevel.2022\e-verse.Navisworks.ViewpointByLevel.2022.csproj", "{4B97B73B-9157-4483-9269-B36FC42EAFF7}"
9-
ProjectSection(ProjectDependencies) = postProject
10-
{053472A7-30BB-4A3B-84BB-FB4E51EC2290} = {053472A7-30BB-4A3B-84BB-FB4E51EC2290}
11-
EndProjectSection
129
EndProject
1310
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2021", "e-verse.Navisworks.ViewpointByLevel.2021\e-verse.Navisworks.ViewpointByLevel.2021.csproj", "{EF82B2C7-EF50-4CF2-B75A-28F6FB3303CD}"
14-
ProjectSection(ProjectDependencies) = postProject
15-
{053472A7-30BB-4A3B-84BB-FB4E51EC2290} = {053472A7-30BB-4A3B-84BB-FB4E51EC2290}
16-
EndProjectSection
1711
EndProject
1812
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2019", "e-verse.Navisworks.ViewpointByLevel.2019\e-verse.Navisworks.ViewpointByLevel.2019.csproj", "{944D393F-9BB3-4C5F-9566-BAAA4745A2CA}"
19-
ProjectSection(ProjectDependencies) = postProject
20-
{053472A7-30BB-4A3B-84BB-FB4E51EC2290} = {053472A7-30BB-4A3B-84BB-FB4E51EC2290}
21-
EndProjectSection
2213
EndProject
2314
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2020", "e-verse.Navisworks.ViewpointByLevel.2020\e-verse.Navisworks.ViewpointByLevel.2020.csproj", "{0D87A374-3B89-400E-9202-CAFF0B845936}"
24-
ProjectSection(ProjectDependencies) = postProject
25-
{053472A7-30BB-4A3B-84BB-FB4E51EC2290} = {053472A7-30BB-4A3B-84BB-FB4E51EC2290}
26-
EndProjectSection
2715
EndProject
2816
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2018", "e-verse.Navisworks.ViewpointByLevel.2018\e-verse.Navisworks.ViewpointByLevel.2018.csproj", "{053472A7-30BB-4A3B-84BB-FB4E51EC2290}"
2917
EndProject
3018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2023", "e-verse.Navisworks.ViewpointByLevel.2023\e-verse.Navisworks.ViewpointByLevel.2023.csproj", "{37B80542-76C6-4592-A84E-B5F45D7150F2}"
31-
ProjectSection(ProjectDependencies) = postProject
32-
{053472A7-30BB-4A3B-84BB-FB4E51EC2290} = {053472A7-30BB-4A3B-84BB-FB4E51EC2290}
33-
{0D87A374-3B89-400E-9202-CAFF0B845936} = {0D87A374-3B89-400E-9202-CAFF0B845936}
34-
{4B97B73B-9157-4483-9269-B36FC42EAFF7} = {4B97B73B-9157-4483-9269-B36FC42EAFF7}
35-
{944D393F-9BB3-4C5F-9566-BAAA4745A2CA} = {944D393F-9BB3-4C5F-9566-BAAA4745A2CA}
36-
{EF82B2C7-EF50-4CF2-B75A-28F6FB3303CD} = {EF82B2C7-EF50-4CF2-B75A-28F6FB3303CD}
37-
EndProjectSection
3819
EndProject
3920
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "e-verse.Navisworks.ViewpointByLevel.Plugin", "e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.shproj", "{A935471B-241F-4256-A392-94148591E4F3}"
4021
EndProject
@@ -44,12 +25,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.Viewpoin
4425
{0D87A374-3B89-400E-9202-CAFF0B845936} = {0D87A374-3B89-400E-9202-CAFF0B845936}
4526
{37B80542-76C6-4592-A84E-B5F45D7150F2} = {37B80542-76C6-4592-A84E-B5F45D7150F2}
4627
{4B97B73B-9157-4483-9269-B36FC42EAFF7} = {4B97B73B-9157-4483-9269-B36FC42EAFF7}
28+
{86BA9743-9136-4DA9-8884-D80183CFE750} = {86BA9743-9136-4DA9-8884-D80183CFE750}
4729
{944D393F-9BB3-4C5F-9566-BAAA4745A2CA} = {944D393F-9BB3-4C5F-9566-BAAA4745A2CA}
30+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924} = {D811AF26-B49A-41C7-BBE4-29AFADDB0924}
31+
{DAAD557E-DA1A-47F7-B45D-7CE63BF77A44} = {DAAD557E-DA1A-47F7-B45D-7CE63BF77A44}
4832
{EF82B2C7-EF50-4CF2-B75A-28F6FB3303CD} = {EF82B2C7-EF50-4CF2-B75A-28F6FB3303CD}
4933
EndProjectSection
5034
EndProject
5135
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2024", "e-verse.Navisworks.ViewpointByLevel.2024\e-verse.Navisworks.ViewpointByLevel.2024.csproj", "{DAAD557E-DA1A-47F7-B45D-7CE63BF77A44}"
5236
EndProject
37+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2025", "e-verse.Navisworks.ViewpointByLevel.2025\e-verse.Navisworks.ViewpointByLevel.2025.csproj", "{D811AF26-B49A-41C7-BBE4-29AFADDB0924}"
38+
EndProject
39+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "e-verse.Navisworks.ViewpointByLevel.2026", "e-verse.Navisworks.ViewpointByLevel.2026\e-verse.Navisworks.ViewpointByLevel.2026.csproj", "{86BA9743-9136-4DA9-8884-D80183CFE750}"
40+
EndProject
5341
Global
5442
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5543
Debug|Any CPU = Debug|Any CPU
@@ -122,6 +110,22 @@ Global
122110
{DAAD557E-DA1A-47F7-B45D-7CE63BF77A44}.Release|Any CPU.Build.0 = Release|Any CPU
123111
{DAAD557E-DA1A-47F7-B45D-7CE63BF77A44}.Release|x86.ActiveCfg = Release|Any CPU
124112
{DAAD557E-DA1A-47F7-B45D-7CE63BF77A44}.Release|x86.Build.0 = Release|Any CPU
113+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
114+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Debug|Any CPU.Build.0 = Debug|Any CPU
115+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Debug|x86.ActiveCfg = Debug|Any CPU
116+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Debug|x86.Build.0 = Debug|Any CPU
117+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Release|Any CPU.ActiveCfg = Release|Any CPU
118+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Release|Any CPU.Build.0 = Release|Any CPU
119+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Release|x86.ActiveCfg = Release|Any CPU
120+
{D811AF26-B49A-41C7-BBE4-29AFADDB0924}.Release|x86.Build.0 = Release|Any CPU
121+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
122+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Debug|Any CPU.Build.0 = Debug|Any CPU
123+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Debug|x86.ActiveCfg = Debug|Any CPU
124+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Debug|x86.Build.0 = Debug|Any CPU
125+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Release|Any CPU.ActiveCfg = Release|Any CPU
126+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Release|Any CPU.Build.0 = Release|Any CPU
127+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Release|x86.ActiveCfg = Release|Any CPU
128+
{86BA9743-9136-4DA9-8884-D80183CFE750}.Release|x86.Build.0 = Release|Any CPU
125129
EndGlobalSection
126130
GlobalSection(SolutionProperties) = preSolution
127131
HideSolutionNode = FALSE
@@ -138,9 +142,13 @@ Global
138142
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{37b80542-76c6-4592-a84e-b5f45d7150f2}*SharedItemsImports = 4
139143
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{4b97b73b-9157-4483-9269-b36fc42eaff7}*SharedItemsImports = 4
140144
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{4b97b73b-9157-4483-9269-b36fc42eaff7}*SharedItemsImports = 4
145+
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{86ba9743-9136-4da9-8884-d80183cfe750}*SharedItemsImports = 4
146+
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{86ba9743-9136-4da9-8884-d80183cfe750}*SharedItemsImports = 4
141147
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{944d393f-9bb3-4c5f-9566-baaa4745a2ca}*SharedItemsImports = 4
142148
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{944d393f-9bb3-4c5f-9566-baaa4745a2ca}*SharedItemsImports = 4
143149
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{a935471b-241f-4256-a392-94148591e4f3}*SharedItemsImports = 13
150+
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{d811af26-b49a-41c7-bbe4-29afaddb0924}*SharedItemsImports = 4
151+
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{d811af26-b49a-41c7-bbe4-29afaddb0924}*SharedItemsImports = 4
144152
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{daad557e-da1a-47f7-b45d-7ce63bf77a44}*SharedItemsImports = 4
145153
e-verse.Navisworks.ViewpointByLevel.Plugin\e-verse.Navisworks.ViewpointByLevel.Plugin.projitems*{daad557e-da1a-47f7-b45d-7ce63bf77a44}*SharedItemsImports = 4
146154
e-verse.Navisworks.ViewpointByLevel.Common\e-verse.Navisworks.ViewpointByLevel.Common.projitems*{ef82b2c7-ef50-4cf2-b75a-28f6fb3303cd}*SharedItemsImports = 4

‎e-verse.Navisworks.ViewpointByLevel.2018/e-verse.Navisworks.ViewpointByLevel.2018.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<PropertyGroup>
128128
<PostBuildEvent>mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2018\en-US"
129129
mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2018\Images"
130-
131130
copy "$(TargetDir)\*.dll" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2018"
132131
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\Images\*" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2018\Images"
133132
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\*.addin" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2018"

‎e-verse.Navisworks.ViewpointByLevel.2019/e-verse.Navisworks.ViewpointByLevel.2019.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<PropertyGroup>
125125
<PostBuildEvent>mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2019\en-US"
126126
mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2019\Images"
127-
128127
copy "$(TargetDir)\*.dll" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2019"
129128
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\Images\*" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2019\Images"
130129
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\*.addin" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2019"

‎e-verse.Navisworks.ViewpointByLevel.2020/e-verse.Navisworks.ViewpointByLevel.2020.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<PropertyGroup>
125125
<PostBuildEvent>mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2020\en-US"
126126
mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2020\Images"
127-
128127
copy "$(TargetDir)\*.dll" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2020"
129128
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\Images\*" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2020\Images"
130129
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\*.addin" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2020"

‎e-verse.Navisworks.ViewpointByLevel.2021/e-verse.Navisworks.ViewpointByLevel.2021.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<PropertyGroup>
129129
<PostBuildEvent>mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2021\en-US"
130130
mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2021\Images"
131-
132131
copy "$(TargetDir)\*.dll" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2021"
133132
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\Images\*" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2021\Images"
134133
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\*.addin" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2021"

‎e-verse.Navisworks.ViewpointByLevel.2022/e-verse.Navisworks.ViewpointByLevel.2022.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
<PropertyGroup>
126126
<PostBuildEvent>mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2022\en-US"
127127
mkdir "$(SolutionDir)\$(SolutionName).bundle\Contents\dlls\2022\Images"
128-
129128
copy "$(TargetDir)\*.dll" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2022"
130129
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\Images\*" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2022\Images"
131130
copy "$(SolutionDir)\e-verse.Navisworks.ViewpointByLevel.Common\*.addin" "$(SolutionDir)$(SolutionName).bundle\Contents\dlls\2022"

0 commit comments

Comments
 (0)