fix binding direct package not support net7

chuongmep · Dec 23, 2022 · b2f337a · b2f337a
1 parent cc086a1
commit b2f337a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/AddInManager/App.cs b/AddInManager/App.cs
@@ -41,8 +41,8 @@ private static void CreateRibbonPanel(UIControlledApplication application)
         var ribbonPanel = application.CreateRibbonPanel("External Tools");
         var pulldownButtonData = new PulldownButtonData("Options", "Add-in Manager");
         var pulldownButton = (PulldownButton)ribbonPanel.AddItem(pulldownButtonData);
-        pulldownButton.Image = ToImageSource(Resource.dev1, BitmapSourceConverter.ImageType.Small);
-        pulldownButton.LargeImage = ToImageSource(Resource.dev1, BitmapSourceConverter.ImageType.Large);
+        pulldownButton.Image = ToImageSource(Resource.dev1, ImageType.Small);
+        pulldownButton.LargeImage = ToImageSource(Resource.dev1, ImageType.Large);
         AddPushButton(pulldownButton, typeof(AddInManagerManual), "Add-In Manager(Manual Mode)");
         AddPushButton(pulldownButton, typeof(AddInManagerFaceless), "Add-In Manager(Manual Mode,Faceless)");
         AddPushButton(pulldownButton, typeof(AddInManagerReadOnly), "Add-In Manager(Read Only Mode)");

diff --git a/AddInManager/RevitAddinManager.csproj b/AddInManager/RevitAddinManager.csproj
@@ -6,7 +6,6 @@
     <ImplicitUsings>true</ImplicitUsings>
     <UseWindowsForms>false</UseWindowsForms>
     <TargetFramework>net48</TargetFramework>
-    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <Configurations>Debug R22;Debug R23;Debug R24</Configurations>
     <Configurations>$(Configurations);Release R18;Release R19;Release R20;Release R21;Release R22;Release R23;Release R24</Configurations>
   </PropertyGroup>
@@ -64,7 +63,6 @@
   <ItemGroup>
     <PackageReference Include="Chuongmep.Revit.Api.RevitAPI" Version="$(RevitVersion).*" />
     <PackageReference Include="Chuongmep.Revit.Api.RevitAPIUI" Version="$(RevitVersion).*" />
-    <PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/AddInManager/View/FrmAddInManager.xaml b/AddInManager/View/FrmAddInManager.xaml
@@ -14,6 +14,8 @@
     MinWidth="400"
     MinHeight="400"
     d:DataContext="{d:DesignInstance viewModel:AddInManagerViewModel}"
+    d:DesignHeight="600"
+    d:DesignWidth="400"
     FocusManager.FocusedElement="{Binding ElementName=tbxSearch}"
     Icon="../Resources/dev.ico"
     PreviewKeyDown="CloseFormEvent"

diff --git a/AddInManager/View/FrmAddInManager.xaml.cs b/AddInManager/View/FrmAddInManager.xaml.cs
@@ -18,8 +18,6 @@ public FrmAddInManager(AddInManagerViewModel vm)
         InitializeComponent();
         DataContext = vm;
         viewModel = vm;
-        this.Width = Properties.App.Default.AppWidth;
-        this.Height = Properties.App.Default.AppHeight;
         App.FrmAddInManager = this;
         ThemManager.ChangeThem(true);
         Title += DefaultSetting.Version;

diff --git a/AddInManager/ViewModel/AddInManagerViewModel.cs b/AddInManager/ViewModel/AddInManagerViewModel.cs
@@ -22,7 +22,8 @@ public class AddInManagerViewModel : ViewModelBase
     private ElementSet Elements { get; set; }
     private RevitEvent RevitEvent = new RevitEvent();
     public AssemLoader AssemLoader { get; set; }
-
+    public int AppWidth { get; set; } = 400;
+    public int AppHeight { get; set; } = 600;
     public AddinManagerBase MAddinManagerBase { get; set; }
 
     private ObservableCollection<AddinModel> commandItems;