-fix installer

-fix settings
franpossetto · Apr 25, 2021 · 62cadf9 · 62cadf9
1 parent 4e4f375
commit 62cadf9
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 114 deletions.
diff --git a/Logging.Core/Nina.Logging.csproj b/Logging.Core/Nina.Logging.csproj
@@ -30,15 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|AnyCPU'">
-    <OutputPath>bin\Setup\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'R2021|AnyCPU'">
     <OutputPath>bin\R2021\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>

diff --git a/Nina.sln b/Nina.sln
@@ -17,11 +17,9 @@ Global
 		R2020|Any CPU = R2020|Any CPU
 		R2021|Any CPU = R2021|Any CPU
 		Release|Any CPU = Release|Any CPU
-		Setup|Any CPU = Setup|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{087ACF19-3757-4128-882E-184561FF227F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{087ACF19-3757-4128-882E-184561FF227F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{087ACF19-3757-4128-882E-184561FF227F}.R2018|Any CPU.ActiveCfg = R2018|Any CPU
 		{087ACF19-3757-4128-882E-184561FF227F}.R2018|Any CPU.Build.0 = R2018|Any CPU
 		{087ACF19-3757-4128-882E-184561FF227F}.R2019|Any CPU.ActiveCfg = R2019|Any CPU
@@ -31,30 +29,23 @@ Global
 		{087ACF19-3757-4128-882E-184561FF227F}.R2021|Any CPU.ActiveCfg = R2021|Any CPU
 		{087ACF19-3757-4128-882E-184561FF227F}.R2021|Any CPU.Build.0 = R2021|Any CPU
 		{087ACF19-3757-4128-882E-184561FF227F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{087ACF19-3757-4128-882E-184561FF227F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{087ACF19-3757-4128-882E-184561FF227F}.Setup|Any CPU.ActiveCfg = Setup|Any CPU
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.Debug|Any CPU.ActiveCfg = Debug
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.R2018|Any CPU.ActiveCfg = Release
-		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.R2018|Any CPU.Build.0 = Release
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.R2019|Any CPU.ActiveCfg = Release
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.R2020|Any CPU.ActiveCfg = Release
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.R2021|Any CPU.ActiveCfg = Release
 		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.Release|Any CPU.ActiveCfg = Release
-		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.Setup|Any CPU.ActiveCfg = Setup
-		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.Setup|Any CPU.Build.0 = Setup
+		{E373DA86-6131-45D9-BDCD-14FD9F41B69B}.Release|Any CPU.Build.0 = Release
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2018|Any CPU.ActiveCfg = Setup|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2018|Any CPU.Build.0 = Setup|Any CPU
+		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2018|Any CPU.ActiveCfg = Release|Any CPU
+		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2018|Any CPU.Build.0 = Release|Any CPU
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2019|Any CPU.ActiveCfg = Release|Any CPU
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2019|Any CPU.Build.0 = Release|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2020|Any CPU.ActiveCfg = R2020|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2020|Any CPU.Build.0 = R2020|Any CPU
+		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2020|Any CPU.ActiveCfg = Release|Any CPU
+		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2020|Any CPU.Build.0 = Release|Any CPU
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2021|Any CPU.ActiveCfg = Release|Any CPU
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.R2021|Any CPU.Build.0 = Release|Any CPU
 		{8E355853-4C84-4A3C-8A4A-4989929C3287}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E355853-4C84-4A3C-8A4A-4989929C3287}.Setup|Any CPU.ActiveCfg = Setup|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Nina/Application/AddinsPanel.cs b/Nina/Application/AddinsPanel.cs
@@ -12,13 +12,13 @@ public static class AddinsPanel
     {
         public static void Build(UIControlledApplication application)
         {
-            RibbonPanel RevitAPIExtensionPanel = Ribbon.CreateRibbonPanel(application, "Revit API Extension");
+            //RibbonPanel RevitAPIExtensionPanel = Ribbon.CreateRibbonPanel(application, "Revit API Extension");
 
-            PushButtonData push_button_data = Ribbon
-                .CreatePushButtonData("push_button_name", "Button Name", "Nina.Info.About");
+            //PushButtonData push_button_data = Ribbon
+            //    .CreatePushButtonData("push_button_name", "Button Name", "Nina.Info.About");
 
-            PushButton item19 = RevitAPIExtensionPanel.AddItem(push_button_data) as PushButton;
-            item19.LargeImage = Icons.links_hide_30;
+            //PushButton item19 = RevitAPIExtensionPanel.AddItem(push_button_data) as PushButton;
+            //item19.LargeImage = Icons.links_hide_30;
 
         }
     }

diff --git a/Nina/ExternalApplication.cs b/Nina/ExternalApplication.cs
@@ -25,7 +25,7 @@ public Result OnStartup(UIControlledApplication application)
             Ribbon.CreateRibbonTab(application, RIBBON_TAB);
             NinaPanel.Build(application,RIBBON_TAB);
             SelectionPanel.Build(application, RIBBON_TAB);
-            Nina.Views.Build(application, RIBBON_TAB);
+            Views.Build(application, RIBBON_TAB);
             PointCloudPanel.Build(application, RIBBON_TAB);
             LinksPanel.Build(application, RIBBON_TAB);
 

diff --git a/Nina/Nina.csproj b/Nina/Nina.csproj
@@ -62,15 +62,6 @@
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Setup|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Setup\</OutputPath>
-    <DefineConstants>REVIT2018</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <LangVersion>default</LangVersion>
-    <ErrorReport>none</ErrorReport>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="AdWindows">
       <HintPath>..\..\..\..\..\..\Program Files\Autodesk\Revit 2020\AdWindows.dll</HintPath>

diff --git a/Nina/Properties/AssemblyInfo.cs b/Nina/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("1.0.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Nina/Settings.Designer.cs b/Nina/Settings.Designer.cs
diff --git a/Nina/Settings.settings b/Nina/Settings.settings
@@ -24,7 +24,7 @@
       <Value Profile="(Default)">1</Value>
     </Setting>
     <Setting Name="ViewRangeTopBottom" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)" />
+      <Value Profile="(Default)">False</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/Nina/app.config b/Nina/app.config
@@ -34,6 +34,9 @@
             <setting name="Tolerance" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="ViewRangeTopBottom" serializeAs="String">
+                <value>False</value>
+            </setting>
         </Nina.Settings>
     </userSettings>
 </configuration>
diff --git a/Nina/packages.config b/Nina/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Microsoft.Net.Http" version="2.0.20710.0" targetFramework="net40" />
+  <package id="System.Net.Http" version="2.0.20710.0" targetFramework="net40" />
   <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
 </packages>
diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj
@@ -7144,70 +7144,6 @@
                 }
             }
         }
-        "Revit2021"
-        {
-        "DisplayName" = "8:Revit2021"
-        "IsDebugOnly" = "11:FALSE"
-        "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Revit2021\\Setup.msi"
-        "PackageFilesAs" = "3:2"
-        "PackageFileSize" = "3:-2147483648"
-        "CabType" = "3:1"
-        "Compression" = "3:2"
-        "SignOutput" = "11:FALSE"
-        "CertificateFile" = "8:"
-        "PrivateKeyFile" = "8:"
-        "TimeStampServer" = "8:"
-        "InstallerBootstrapper" = "3:2"
-            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
-            {
-            "Enabled" = "11:TRUE"
-            "PromptEnabled" = "11:TRUE"
-            "PrerequisitesLocation" = "2:1"
-            "Url" = "8:"
-            "ComponentsUrl" = "8:"
-                "Items"
-                {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
-                    {
-                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
-                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
-                    }
-                }
-            }
-        }
-        "Setup"
-        {
-        "DisplayName" = "8:Setup"
-        "IsDebugOnly" = "11:FALSE"
-        "IsReleaseOnly" = "11:FALSE"
-        "OutputFilename" = "8:Setup\\Setup.msi"
-        "PackageFilesAs" = "3:2"
-        "PackageFileSize" = "3:-2147483648"
-        "CabType" = "3:1"
-        "Compression" = "3:2"
-        "SignOutput" = "11:FALSE"
-        "CertificateFile" = "8:"
-        "PrivateKeyFile" = "8:"
-        "TimeStampServer" = "8:"
-        "InstallerBootstrapper" = "3:2"
-            "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
-            {
-            "Enabled" = "11:TRUE"
-            "PromptEnabled" = "11:TRUE"
-            "PrerequisitesLocation" = "2:1"
-            "Url" = "8:"
-            "ComponentsUrl" = "8:"
-                "Items"
-                {
-                    "{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.7.2"
-                    {
-                    "Name" = "8:Microsoft .NET Framework 4.7.2 (x86 and x64)"
-                    "ProductCode" = "8:.NETFramework,Version=v4.7.2"
-                    }
-                }
-            }
-        }
     }
     "Deployable"
     {
@@ -12837,15 +12773,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Nina"
-        "ProductCode" = "8:{A43B1E4D-8B4A-4B37-92C5-28C68D47B970}"
-        "PackageCode" = "8:{BC60C0A9-D905-4A1F-A8AA-689BAAD7EDEA}"
+        "ProductCode" = "8:{EC994DBB-800C-4ED4-9E42-174BC2927C6A}"
+        "PackageCode" = "8:{FF2A09C1-E7C8-45E2-B523-72AF416FBF1A}"
         "UpgradeCode" = "8:{C5102866-23FF-4EC2-B050-06185169D198}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
-        "RemovePreviousVersions" = "11:FALSE"
+        "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.3.0"
+        "ProductVersion" = "8:1.4.1"
         "Manufacturer" = "8:Nina"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -12859,7 +12795,7 @@
         "ARPIconIndex" = "3:0"
         "SearchPath" = "8:"
         "UseSystemSearchPath" = "11:TRUE"
-        "TargetPlatform" = "3:0"
+        "TargetPlatform" = "3:1"
         "PreBuildEvent" = "8:"
         "PostBuildEvent" = "8:"
         "RunPostBuildEvent" = "3:0"
@@ -13324,7 +13260,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_300350BCD9E84AEFB0D9E8CCD0535D83"
             {
-            "SourcePath" = "8:..\\Nina\\obj\\R2018\\Nina.dll"
+            "SourcePath" = "8:..\\Nina\\obj\\R2021\\Nina.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F8195823E6AD46169B9CB74B448508D4"
@@ -13352,7 +13288,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3ECB85A0944A45A893E0EC93EFD2A234"
             {
-            "SourcePath" = "8:..\\Nina\\obj\\R2018\\Nina.dll"
+            "SourcePath" = "8:..\\Nina\\obj\\R2021\\Nina.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_3A63AFCC6EEE4189974FCA79E6DAB42F"
@@ -13380,7 +13316,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_463EAA4021A64983B0D055839C5DA1F4"
             {
-            "SourcePath" = "8:..\\Nina\\obj\\R2018\\Nina.dll"
+            "SourcePath" = "8:..\\Nina\\obj\\R2021\\Nina.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_EBEA2C0D119D48209A2E9DA468361EC5"
@@ -13520,7 +13456,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_F4AC8C285E25411EB63AF5AB57956111"
             {
-            "SourcePath" = "8:..\\Nina\\obj\\R2018\\Nina.dll"
+            "SourcePath" = "8:..\\Nina\\obj\\R2021\\Nina.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_3999F2FC38EE416EBC9C4E55094BFA78"

diff --git a/Setup/Setup/setup.exe b/Setup/Setup/setup.exe