Merge pull request #12 from ThorntonTomasetti/Release-0.6.0.0

Release 0.6.0.0
ThorntonTomasetti · Jul 17, 2020 · 055940b · 055940b
2 parents b4bbdaa + 11f31b7
commit 055940b
Show file tree

Hide file tree

Showing 21 changed files with 19 additions and 19 deletions.
diff --git a/Beacon/Beacon.csproj b/Beacon/Beacon.csproj
@@ -336,18 +336,18 @@ copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2020\Beacon"
 
 if $(ConfigurationName) == Release2018Internal (
 if exist $(SolutionDir)..\TTCore_2020.pfx ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /fd SHA256 /f $(SolutionDir)..\TTCore_2020.pfx /p C@TTrvt2020! $(TargetPath))
-del /q "$(SolutionDir)Deployment\Revit2018\Beacon\*"
-copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2018\Beacon"
+del /q "$(SolutionDir)Deployment\Revit2018\BeaconInternal\*"
+copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2018\BeaconInternal"
 )
 if $(ConfigurationName) == Release2019Internal (
 if exist $(SolutionDir)..\TTCore_2020.pfx ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /fd SHA256 /f $(SolutionDir)..\TTCore_2020.pfx /p C@TTrvt2020! $(TargetPath))
-del /q "$(SolutionDir)Deployment\Revit2019\Beacon\*"
-copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2019\Beacon"
+del /q "$(SolutionDir)Deployment\Revit2019\BeaconInternal\*"
+copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2019\BeaconInternal"
 )
 if $(ConfigurationName) == Release2020Internal (
 if exist $(SolutionDir)..\TTCore_2020.pfx ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /fd SHA256 /f $(SolutionDir)..\TTCore_2020.pfx /p C@TTrvt2020! $(TargetPath))
-del /q "$(SolutionDir)Deployment\Revit2020\Beacon\*"
-copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2020\Beacon"
+del /q "$(SolutionDir)Deployment\Revit2020\BeaconInternal\*"
+copy "$(TargetDir)*.dll" "$(SolutionDir)Deployment\Revit2020\BeaconInternal"
 )</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/Beacon/Plots/PlotData.cs b/Beacon/Plots/PlotData.cs
@@ -549,11 +549,11 @@ public void PopulateTimberGwpList()
         {
             TimberGwpList = new List<GwpNameValue>()
             {
-                new GwpNameValue("Softwood Lumber", 95.0),
-                new GwpNameValue("Softwood Plywood", 169.7),
-                new GwpNameValue("Oriented Strand Board", 324.8),
-                new GwpNameValue("Glulam", 258.9),
-                new GwpNameValue("Laminated Veneer Lumber", 263.9)
+                new GwpNameValue("Softwood Lumber", 55.54),
+                new GwpNameValue("Softwood Plywood", 99.22),
+                new GwpNameValue("Oriented Strand Board", 189.85),
+                new GwpNameValue("Glulam", 151.36),
+                new GwpNameValue("Laminated Veneer Lumber", 154.29)
             };
             GwpSelectedIndex = 0;
             GwpSelected = TimberGwpList[0];

diff --git a/Beacon/Properties/AssemblyInfo.cs b/Beacon/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.6.0.0")]
+[assembly: AssemblyFileVersion("0.6.0.0")]
diff --git a/BeaconInstaller/BeaconInstaller.vdproj b/BeaconInstaller/BeaconInstaller.vdproj
@@ -706,7 +706,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_3CD25B80BEDC47E3829FE3DFE177225F"
@@ -850,7 +850,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_5A15CD9C758B43AABE0D4F533769B75D"
@@ -912,7 +912,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL"
+            "AssemblyAsmDisplayName" = "8:Beacon, Version=0.6.0.0, Culture=neutral, processorArchitecture=MSIL"
                 "ScatterAssemblies"
                 {
                     "_8B51B39082594E35BA87D08806F52AFE"
@@ -1250,15 +1250,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Beacon"
-        "ProductCode" = "8:{B4EC2C0C-8926-46BB-8A47-B74080E10DBA}"
-        "PackageCode" = "8:{F523AD25-3422-4DF1-BD1E-77E9C16F9AF3}"
+        "ProductCode" = "8:{6F22663F-C399-4F5F-B262-DB04E640BC8E}"
+        "PackageCode" = "8:{155CDBFE-A880-496E-A1EA-4EA3A951D1B1}"
         "UpgradeCode" = "8:{A3A19A37-6DE8-443F-9205-329EE02CD780}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:0.5.0"
+        "ProductVersion" = "8:0.6.0"
         "Manufacturer" = "8:Beacon"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

diff --git a/BeaconInstaller/Release2020Internal/BeaconInstaller.msi b/BeaconInstaller/Release2020Internal/BeaconInstaller.msi
diff --git a/BeaconInstaller/Release2020Internal/setup.exe b/BeaconInstaller/Release2020Internal/setup.exe
diff --git a/Deployment/Revit2018/Beacon/Beacon.dll b/Deployment/Revit2018/Beacon/Beacon.dll
diff --git a/Deployment/Revit2018/BeaconInternal/Beacon.dll b/Deployment/Revit2018/BeaconInternal/Beacon.dll
diff --git a/Deployment/Revit2018/BeaconInternal/Newtonsoft.Json.dll b/Deployment/Revit2018/BeaconInternal/Newtonsoft.Json.dll
diff --git a/Deployment/Revit2018/BeaconInternal/OxyPlot.Wpf.dll b/Deployment/Revit2018/BeaconInternal/OxyPlot.Wpf.dll
diff --git a/Deployment/Revit2018/BeaconInternal/OxyPlot.dll b/Deployment/Revit2018/BeaconInternal/OxyPlot.dll
diff --git a/Deployment/Revit2019/Beacon/Beacon.dll b/Deployment/Revit2019/Beacon/Beacon.dll
diff --git a/Deployment/Revit2019/BeaconInternal/Beacon.dll b/Deployment/Revit2019/BeaconInternal/Beacon.dll
diff --git a/Deployment/Revit2019/BeaconInternal/Newtonsoft.Json.dll b/Deployment/Revit2019/BeaconInternal/Newtonsoft.Json.dll
diff --git a/Deployment/Revit2019/BeaconInternal/OxyPlot.Wpf.dll b/Deployment/Revit2019/BeaconInternal/OxyPlot.Wpf.dll
diff --git a/Deployment/Revit2019/BeaconInternal/OxyPlot.dll b/Deployment/Revit2019/BeaconInternal/OxyPlot.dll
diff --git a/Deployment/Revit2020/Beacon/Beacon.dll b/Deployment/Revit2020/Beacon/Beacon.dll
diff --git a/Deployment/Revit2020/BeaconInternal/Beacon.dll b/Deployment/Revit2020/BeaconInternal/Beacon.dll
diff --git a/Deployment/Revit2020/BeaconInternal/Newtonsoft.Json.dll b/Deployment/Revit2020/BeaconInternal/Newtonsoft.Json.dll
diff --git a/Deployment/Revit2020/BeaconInternal/OxyPlot.Wpf.dll b/Deployment/Revit2020/BeaconInternal/OxyPlot.Wpf.dll
diff --git a/Deployment/Revit2020/BeaconInternal/OxyPlot.dll b/Deployment/Revit2020/BeaconInternal/OxyPlot.dll