diff --git a/Logging.Core/Nina.Logging.csproj b/Logging.Core/Nina.Logging.csproj index 1ea740a..19468ed 100644 --- a/Logging.Core/Nina.Logging.csproj +++ b/Logging.Core/Nina.Logging.csproj @@ -30,15 +30,6 @@ prompt 4 - - bin\Setup\ - TRACE - true - pdbonly - AnyCPU - 7.3 - prompt - bin\R2021\ TRACE diff --git a/Nina.sln b/Nina.sln index e1ccf1a..8e2b7e9 100644 --- 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 index 84a70a6..4bb0c2e 100644 --- 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 index e571f1b..174d122 100644 --- 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 index 46b71a4..c61d893 100644 --- a/Nina/Nina.csproj +++ b/Nina/Nina.csproj @@ -62,15 +62,6 @@ pdbonly true - - true - bin\Setup\ - REVIT2018 - full - AnyCPU - default - none - ..\..\..\..\..\..\Program Files\Autodesk\Revit 2020\AdWindows.dll diff --git a/Nina/Properties/AssemblyInfo.cs b/Nina/Properties/AssemblyInfo.cs index a8f4b9e..8dd622c 100644 --- 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 index 5145d6a..92e34b7 100644 --- a/Nina/Settings.Designer.cs +++ b/Nina/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Nina { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -109,6 +109,7 @@ public double Tolerance { [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] public bool ViewRangeTopBottom { get { return ((bool)(this["ViewRangeTopBottom"])); diff --git a/Nina/Settings.settings b/Nina/Settings.settings index 04037a0..2e48728 100644 --- a/Nina/Settings.settings +++ b/Nina/Settings.settings @@ -24,7 +24,7 @@ 1 - + False \ No newline at end of file diff --git a/Nina/app.config b/Nina/app.config index dd535b5..6e6e61f 100644 --- a/Nina/app.config +++ b/Nina/app.config @@ -34,6 +34,9 @@ 1 + + False + \ No newline at end of file diff --git a/Nina/packages.config b/Nina/packages.config index 25adb75..c6f8a72 100644 --- a/Nina/packages.config +++ b/Nina/packages.config @@ -1,4 +1,6 @@  + + \ No newline at end of file diff --git a/Setup/Setup.vdproj b/Setup/Setup.vdproj index cd21f37..3952ad3 100644 --- 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 deleted file mode 100644 index e6e5f22..0000000 Binary files a/Setup/Setup/setup.exe and /dev/null differ