diff --git a/CommandGroupIcons/vb/CommandIcons/CommandIcons.vbproj b/CommandGroupIcons/vb/CommandIcons/CommandIcons.vbproj index 551e60a..a5a3d6e 100644 --- a/CommandGroupIcons/vb/CommandIcons/CommandIcons.vbproj +++ b/CommandGroupIcons/vb/CommandIcons/CommandIcons.vbproj @@ -71,14 +71,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -140,11 +140,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/CommandGroupIcons/vb/CommandIcons/packages.config b/CommandGroupIcons/vb/CommandIcons/packages.config index 2a78f17..2d28f6b 100644 --- a/CommandGroupIcons/vb/CommandIcons/packages.config +++ b/CommandGroupIcons/vb/CommandIcons/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/DimensionWatcher/NuGet.Config b/DimensionWatcher/NuGet.Config deleted file mode 100644 index 2227146..0000000 --- a/DimensionWatcher/NuGet.Config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/DimensionWatcher/DimensionWatcher.csproj b/DimensionWatcher/cs/DimensionWatcher.csproj similarity index 87% rename from DimensionWatcher/DimensionWatcher.csproj rename to DimensionWatcher/cs/DimensionWatcher.csproj index 7051e08..4b16ea2 100644 --- a/DimensionWatcher/DimensionWatcher.csproj +++ b/DimensionWatcher/cs/DimensionWatcher.csproj @@ -60,13 +60,13 @@ - packages\Xarial.XCad.0.7.5-20211001.3\lib\net461\Xarial.XCad.dll + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - packages\Xarial.XCad.SolidWorks.0.7.5-20211001.3\lib\net461\Xarial.XCad.SolidWorks.dll + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - packages\Xarial.XCad.Toolkit.0.7.5-20211001.3\lib\net461\Xarial.XCad.Toolkit.dll + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -93,11 +93,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/DimensionWatcher/DimensionWatcher.sln b/DimensionWatcher/cs/DimensionWatcher.sln similarity index 100% rename from DimensionWatcher/DimensionWatcher.sln rename to DimensionWatcher/cs/DimensionWatcher.sln diff --git a/DimensionWatcher/DimensionWatcherAddIn.cs b/DimensionWatcher/cs/DimensionWatcherAddIn.cs similarity index 100% rename from DimensionWatcher/DimensionWatcherAddIn.cs rename to DimensionWatcher/cs/DimensionWatcherAddIn.cs diff --git a/DimensionWatcher/DimensionWatcherData.cs b/DimensionWatcher/cs/DimensionWatcherData.cs similarity index 100% rename from DimensionWatcher/DimensionWatcherData.cs rename to DimensionWatcher/cs/DimensionWatcherData.cs diff --git a/DimensionWatcher/DimensionWatcherMacroFeatureDefinition.cs b/DimensionWatcher/cs/DimensionWatcherMacroFeatureDefinition.cs similarity index 100% rename from DimensionWatcher/DimensionWatcherMacroFeatureDefinition.cs rename to DimensionWatcher/cs/DimensionWatcherMacroFeatureDefinition.cs diff --git a/DimensionWatcher/Properties/AssemblyInfo.cs b/DimensionWatcher/cs/Properties/AssemblyInfo.cs similarity index 100% rename from DimensionWatcher/Properties/AssemblyInfo.cs rename to DimensionWatcher/cs/Properties/AssemblyInfo.cs diff --git a/DimensionWatcher/Properties/Resources.Designer.cs b/DimensionWatcher/cs/Properties/Resources.Designer.cs similarity index 100% rename from DimensionWatcher/Properties/Resources.Designer.cs rename to DimensionWatcher/cs/Properties/Resources.Designer.cs diff --git a/DimensionWatcher/Properties/Resources.resx b/DimensionWatcher/cs/Properties/Resources.resx similarity index 100% rename from DimensionWatcher/Properties/Resources.resx rename to DimensionWatcher/cs/Properties/Resources.resx diff --git a/DimensionWatcher/Resources/dimension-watch-icon.png b/DimensionWatcher/cs/Resources/dimension-watch-icon.png similarity index 100% rename from DimensionWatcher/Resources/dimension-watch-icon.png rename to DimensionWatcher/cs/Resources/dimension-watch-icon.png diff --git a/DimensionWatcher/cs/packages.config b/DimensionWatcher/cs/packages.config new file mode 100644 index 0000000..2d28f6b --- /dev/null +++ b/DimensionWatcher/cs/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/DimensionWatcher/packages.config b/DimensionWatcher/packages.config deleted file mode 100644 index 2ef10e7..0000000 --- a/DimensionWatcher/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/DocumentFeatureTabs/cs/DocumentFeatureTabs.csproj b/DocumentFeatureTabs/cs/DocumentFeatureTabs.csproj index 408a2f4..89575e0 100644 --- a/DocumentFeatureTabs/cs/DocumentFeatureTabs.csproj +++ b/DocumentFeatureTabs/cs/DocumentFeatureTabs.csproj @@ -60,14 +60,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -103,11 +103,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/DocumentFeatureTabs/cs/packages.config b/DocumentFeatureTabs/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/DocumentFeatureTabs/cs/packages.config +++ b/DocumentFeatureTabs/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/EventsHandler/vb/EventsHandler.vbproj b/EventsHandler/vb/EventsHandler.vbproj index 635ed93..df77c0e 100644 --- a/EventsHandler/vb/EventsHandler.vbproj +++ b/EventsHandler/vb/EventsHandler.vbproj @@ -70,14 +70,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -132,11 +132,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/EventsHandler/vb/packages.config b/EventsHandler/vb/packages.config index 2a78f17..2d28f6b 100644 --- a/EventsHandler/vb/packages.config +++ b/EventsHandler/vb/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/FormsAndWpfControls/cs/FormsAndWpfControls.csproj b/FormsAndWpfControls/cs/FormsAndWpfControls.csproj index 5928a0f..23bf3c1 100644 --- a/FormsAndWpfControls/cs/FormsAndWpfControls.csproj +++ b/FormsAndWpfControls/cs/FormsAndWpfControls.csproj @@ -60,14 +60,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -113,11 +113,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/FormsAndWpfControls/cs/WinFormsUserControl.cs b/FormsAndWpfControls/cs/WinFormsUserControl.cs index 6e4a8e6..7775562 100644 --- a/FormsAndWpfControls/cs/WinFormsUserControl.cs +++ b/FormsAndWpfControls/cs/WinFormsUserControl.cs @@ -23,6 +23,6 @@ public WinFormsUserControl() public object Value { get; set; } - public event Action ValueChanged; + public event CustomControlValueChangedDelegate ValueChanged; } } diff --git a/FormsAndWpfControls/cs/packages.config b/FormsAndWpfControls/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/FormsAndWpfControls/cs/packages.config +++ b/FormsAndWpfControls/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/FormsAndWpfControls/vb/FormsAndWpfControls.vbproj b/FormsAndWpfControls/vb/FormsAndWpfControls.vbproj index 6d4f4df..308d5e0 100644 --- a/FormsAndWpfControls/vb/FormsAndWpfControls.vbproj +++ b/FormsAndWpfControls/vb/FormsAndWpfControls.vbproj @@ -72,14 +72,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -159,11 +159,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/FormsAndWpfControls/vb/WinFormsUserControl.vb b/FormsAndWpfControls/vb/WinFormsUserControl.vb index 0e678d0..142b546 100644 --- a/FormsAndWpfControls/vb/WinFormsUserControl.vb +++ b/FormsAndWpfControls/vb/WinFormsUserControl.vb @@ -19,6 +19,6 @@ Public Class WinFormsUserControl End Set End Property - Public Event ValueChanged As Action(Of IXCustomControl, Object) Implements IXCustomControl.ValueChanged + Public Event ValueChanged As CustomControlValueChangedDelegate Implements IXCustomControl.ValueChanged End Class diff --git a/FormsAndWpfControls/vb/packages.config b/FormsAndWpfControls/vb/packages.config index 2a78f17..2d28f6b 100644 --- a/FormsAndWpfControls/vb/packages.config +++ b/FormsAndWpfControls/vb/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/FurnitureConfigurator/Tests/Tests.csproj b/FurnitureConfigurator/Tests/Tests.csproj index e4aaf7d..8caff9e 100644 --- a/FurnitureConfigurator/Tests/Tests.csproj +++ b/FurnitureConfigurator/Tests/Tests.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/FurnitureConfigurator/cs/FurnitureConfigurator.csproj b/FurnitureConfigurator/cs/FurnitureConfigurator.csproj index 24b426a..5bb0184 100644 --- a/FurnitureConfigurator/cs/FurnitureConfigurator.csproj +++ b/FurnitureConfigurator/cs/FurnitureConfigurator.csproj @@ -72,13 +72,13 @@ - packages\Xarial.XCad.0.7.5-20210805.1\lib\net461\Xarial.XCad.dll + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - packages\Xarial.XCad.SolidWorks.0.7.5-20210805.1\lib\net461\Xarial.XCad.SolidWorks.dll + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - packages\Xarial.XCad.Toolkit.0.7.5-20210805.1\lib\net461\Xarial.XCad.Toolkit.dll + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll packages\Xarial.XToolkit.0.2.20\lib\net461\Xarial.XToolkit.dll @@ -180,8 +180,8 @@ - + - + \ No newline at end of file diff --git a/FurnitureConfigurator/cs/Services/CabinetConfiguratorService.cs b/FurnitureConfigurator/cs/Services/CabinetConfiguratorService.cs index 7cb67e0..5af989f 100644 --- a/FurnitureConfigurator/cs/Services/CabinetConfiguratorService.cs +++ b/FurnitureConfigurator/cs/Services/CabinetConfiguratorService.cs @@ -35,7 +35,7 @@ public void Configure(IXAssembly assm, double width, double height, double depth if (hasChanges) { - assm.Regenerate(); + assm.Rebuild(); } } diff --git a/FurnitureConfigurator/cs/packages.config b/FurnitureConfigurator/cs/packages.config index b1ae507..ac1c037 100644 --- a/FurnitureConfigurator/cs/packages.config +++ b/FurnitureConfigurator/cs/packages.config @@ -2,10 +2,10 @@ - - + + - + \ No newline at end of file diff --git a/IssuesManager/cs/IssuesManager/IssuesManager.csproj b/IssuesManager/cs/IssuesManager/IssuesManager.csproj index 8a53e21..a9d7016 100644 --- a/IssuesManager/cs/IssuesManager/IssuesManager.csproj +++ b/IssuesManager/cs/IssuesManager/IssuesManager.csproj @@ -54,8 +54,8 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll ..\packages\Xarial.XToolkit.0.2.20\lib\net461\Xarial.XToolkit.dll diff --git a/IssuesManager/cs/IssuesManager/IssuesManagerController.cs b/IssuesManager/cs/IssuesManager/IssuesManagerController.cs index a24e83b..d363ff6 100644 --- a/IssuesManager/cs/IssuesManager/IssuesManagerController.cs +++ b/IssuesManager/cs/IssuesManager/IssuesManagerController.cs @@ -38,14 +38,14 @@ public IssuesManagerController(IXExtension ext) m_Ext = ext; m_Ext.Application.Documents.RegisterHandler(); - m_Ext.Application.Documents.DocumentCreated += OnDocumentCreated; + m_Ext.Application.Documents.DocumentLoaded += OnDocumentLoaded; m_TaskPane = m_Ext.CreateTaskPane(); m_IssuesControl = m_TaskPane.Control; m_TaskPane.ButtonClick += OnTaskPaneButtonClick; } - private void OnDocumentCreated(IXDocument doc) + private void OnDocumentLoaded(IXDocument doc) { var issuesDoc = m_Ext.Application.Documents.GetHandler(doc); issuesDoc.Destroyed += OnIssuesDocDestroyed; @@ -95,7 +95,7 @@ private void OnShowIssues(IssuesVM issues) public void Dispose() { - m_Ext.Application.Documents.DocumentCreated -= OnDocumentCreated; + m_Ext.Application.Documents.DocumentLoaded -= OnDocumentLoaded; m_TaskPane.ButtonClick -= OnTaskPaneButtonClick; } } diff --git a/IssuesManager/cs/IssuesManager/packages.config b/IssuesManager/cs/IssuesManager/packages.config index db7732b..80e113c 100644 --- a/IssuesManager/cs/IssuesManager/packages.config +++ b/IssuesManager/cs/IssuesManager/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/IssuesManager/cs/SwAddIn/SwAddIn.csproj b/IssuesManager/cs/SwAddIn/SwAddIn.csproj index d0f3706..52110ba 100644 --- a/IssuesManager/cs/SwAddIn/SwAddIn.csproj +++ b/IssuesManager/cs/SwAddIn/SwAddIn.csproj @@ -61,14 +61,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -86,11 +86,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/IssuesManager/cs/SwAddIn/packages.config b/IssuesManager/cs/SwAddIn/packages.config index 937c5b3..ad5ee25 100644 --- a/IssuesManager/cs/SwAddIn/packages.config +++ b/IssuesManager/cs/SwAddIn/packages.config @@ -1,8 +1,8 @@  - - + + - + \ No newline at end of file diff --git a/ModelGeneratorConsole/cs/model-generator.csproj b/ModelGeneratorConsole/cs/model-generator.csproj index d642b9f..c8b39c2 100644 --- a/ModelGeneratorConsole/cs/model-generator.csproj +++ b/ModelGeneratorConsole/cs/model-generator.csproj @@ -7,7 +7,7 @@ - + diff --git a/PMPage/cs/PMPage.csproj b/PMPage/cs/PMPage.csproj index 05471e6..8da9985 100644 --- a/PMPage/cs/PMPage.csproj +++ b/PMPage/cs/PMPage.csproj @@ -61,13 +61,13 @@ - packages\Xarial.XCad.0.7.5-20210923.2\lib\net461\Xarial.XCad.dll + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - packages\Xarial.XCad.SolidWorks.0.7.5-20210923.2\lib\net461\Xarial.XCad.SolidWorks.dll + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - packages\Xarial.XCad.Toolkit.0.7.5-20210923.2\lib\net461\Xarial.XCad.Toolkit.dll + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -121,19 +121,12 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - -<<<<<<< Updated upstream + - -======= - - - ->>>>>>> Stashed changes + \ No newline at end of file diff --git a/PMPage/cs/Page/Groups/ItemSourceControlsGroup.cs b/PMPage/cs/Page/Groups/ItemSourceControlsGroup.cs index e5bcb4b..92c3055 100644 --- a/PMPage/cs/Page/Groups/ItemSourceControlsGroup.cs +++ b/PMPage/cs/Page/Groups/ItemSourceControlsGroup.cs @@ -92,7 +92,6 @@ public class ItemSourceControlsGroup /// This property will be rendered as ComboBox where items will be read from the property /// [ComboBox(ItemsSource = "ItemsDataSource")] - [ComboBoxOptions(selectDefaultValue: true)] public string ComboBoxItem { get; set; } /// diff --git a/PMPage/cs/Page/Groups/SimpleControlsGroup.cs b/PMPage/cs/Page/Groups/SimpleControlsGroup.cs index cc6b5e6..20172f1 100644 --- a/PMPage/cs/Page/Groups/SimpleControlsGroup.cs +++ b/PMPage/cs/Page/Groups/SimpleControlsGroup.cs @@ -19,8 +19,9 @@ public class SimpleControlsGroup public string TextBox { get; set; } /// - /// property will be rendered as NumberBox control + /// property will be rendered as NumberBox control with label /// + [Label("Number Box Control with label")] public int NumberBox { get; set; } /// @@ -51,6 +52,13 @@ public class SimpleControlsGroup /// public IXFace SelectionBox { get; set; } + /// + /// Text block property + /// + [TextBlock] + [TextBlockOptions(TextAlignment_e.Center)] + public string TextBlock => "Sample Text Block"; + /// /// This control will be rendered as picture with the default size /// diff --git a/PMPage/cs/packages.config b/PMPage/cs/packages.config index d7d3653..2d28f6b 100644 --- a/PMPage/cs/packages.config +++ b/PMPage/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/PMPageToggleBitmapButtons/cs/PMPageToggleBitmapButtons.csproj b/PMPageToggleBitmapButtons/cs/PMPageToggleBitmapButtons.csproj index 20b1814..ba4bd42 100644 --- a/PMPageToggleBitmapButtons/cs/PMPageToggleBitmapButtons.csproj +++ b/PMPageToggleBitmapButtons/cs/PMPageToggleBitmapButtons.csproj @@ -59,14 +59,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -107,11 +107,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/PMPageToggleBitmapButtons/cs/packages.config b/PMPageToggleBitmapButtons/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/PMPageToggleBitmapButtons/cs/packages.config +++ b/PMPageToggleBitmapButtons/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/ParametricBox/cs/Box/Box.csproj b/ParametricBox/cs/Box/Box.csproj index 94a07b0..62784e7 100644 --- a/ParametricBox/cs/Box/Box.csproj +++ b/ParametricBox/cs/Box/Box.csproj @@ -59,14 +59,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -100,11 +100,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/ParametricBox/cs/Box/packages.config b/ParametricBox/cs/Box/packages.config index 2a78f17..2d28f6b 100644 --- a/ParametricBox/cs/Box/packages.config +++ b/ParametricBox/cs/Box/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/ProgressBar/cs/ProgressBar.csproj b/ProgressBar/cs/ProgressBar.csproj index 185c390..6d3f04d 100644 --- a/ProgressBar/cs/ProgressBar.csproj +++ b/ProgressBar/cs/ProgressBar.csproj @@ -60,14 +60,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -103,11 +103,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/ProgressBar/cs/packages.config b/ProgressBar/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/ProgressBar/cs/packages.config +++ b/ProgressBar/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/PropertiesReader/cs/PropertiesReader/PropertiesReader.csproj b/PropertiesReader/cs/PropertiesReader/PropertiesReader.csproj index bb22f57..b15f13a 100644 --- a/PropertiesReader/cs/PropertiesReader/PropertiesReader.csproj +++ b/PropertiesReader/cs/PropertiesReader/PropertiesReader.csproj @@ -46,8 +46,8 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll ..\packages\Xarial.XToolkit.0.2.20\lib\net461\Xarial.XToolkit.dll diff --git a/PropertiesReader/cs/PropertiesReader/PropertiesReaderService.cs b/PropertiesReader/cs/PropertiesReader/PropertiesReaderService.cs index 61084ef..63a2354 100644 --- a/PropertiesReader/cs/PropertiesReader/PropertiesReaderService.cs +++ b/PropertiesReader/cs/PropertiesReader/PropertiesReaderService.cs @@ -40,7 +40,7 @@ public DataTable ReadProperties(string assmFilePath) return ""; } }).Where(x => !string.IsNullOrEmpty(x.Key)) - .Select(x => x.First().Document) + .Select(x => x.First().ReferencedDocument) .Where(x => x.IsCommitted).ToArray(); foreach (var refDoc in refDocs) diff --git a/PropertiesReader/cs/PropertiesReader/packages.config b/PropertiesReader/cs/PropertiesReader/packages.config index 63202e6..03e8cee 100644 --- a/PropertiesReader/cs/PropertiesReader/packages.config +++ b/PropertiesReader/cs/PropertiesReader/packages.config @@ -1,7 +1,7 @@  - + \ No newline at end of file diff --git a/PropertiesReader/cs/SwDmPropertiesReader/SwDmPropertiesReader.csproj b/PropertiesReader/cs/SwDmPropertiesReader/SwDmPropertiesReader.csproj index 17c6dcf..3436e84 100644 --- a/PropertiesReader/cs/SwDmPropertiesReader/SwDmPropertiesReader.csproj +++ b/PropertiesReader/cs/SwDmPropertiesReader/SwDmPropertiesReader.csproj @@ -38,7 +38,7 @@ ..\packages\Xarial.XCad.SolidWorks.DocumentManager.Interops.0.1.0\lib\net40\SolidWorks.Interop.swdocumentmgr.dll - True + False @@ -54,14 +54,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SwDocumentManager.0.7.4\lib\net461\Xarial.XCad.SwDocumentManager.dll + + ..\packages\Xarial.XCad.SwDocumentManager.0.7.5\lib\net461\Xarial.XCad.SwDocumentManager.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll diff --git a/PropertiesReader/cs/SwDmPropertiesReader/packages.config b/PropertiesReader/cs/SwDmPropertiesReader/packages.config index 86660d6..73b8fc7 100644 --- a/PropertiesReader/cs/SwDmPropertiesReader/packages.config +++ b/PropertiesReader/cs/SwDmPropertiesReader/packages.config @@ -1,7 +1,7 @@  - + - - + + \ No newline at end of file diff --git a/PropertiesReader/cs/SwPropertiesReader/SwPropertiesReader.csproj b/PropertiesReader/cs/SwPropertiesReader/SwPropertiesReader.csproj index d2e7653..0b2639d 100644 --- a/PropertiesReader/cs/SwPropertiesReader/SwPropertiesReader.csproj +++ b/PropertiesReader/cs/SwPropertiesReader/SwPropertiesReader.csproj @@ -66,14 +66,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -134,7 +134,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + \ No newline at end of file diff --git a/PropertiesReader/cs/SwPropertiesReader/packages.config b/PropertiesReader/cs/SwPropertiesReader/packages.config index 2a78f17..2d28f6b 100644 --- a/PropertiesReader/cs/SwPropertiesReader/packages.config +++ b/PropertiesReader/cs/SwPropertiesReader/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/PropertyAsFileName/cs/PropertyAsFileName.csproj b/PropertyAsFileName/cs/PropertyAsFileName.csproj index 43d0f49..23d7c79 100644 --- a/PropertyAsFileName/cs/PropertyAsFileName.csproj +++ b/PropertyAsFileName/cs/PropertyAsFileName.csproj @@ -58,14 +58,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -76,11 +76,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/PropertyAsFileName/cs/packages.config b/PropertyAsFileName/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/PropertyAsFileName/cs/packages.config +++ b/PropertyAsFileName/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/README.md b/README.md index d53b3c8..8670801 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,12 @@ Example demonstrates how to attach feature manager tabs to all created documents # Task Pane AddIn and MSI-Installers -Example demonstrates how to hsot WPF control in Task Pane and how to create MSI-installers for SOLIDWORKS add-in +Example demonstrates how to host WPF control in Task Pane and how to create MSI-installers for SOLIDWORKS add-in -[C#](TaskPaneAddIn/cs) \ No newline at end of file +[C#](TaskPaneAddIn/cs) + +# Dimension Watcher Macro Feature + +Example demonstrates how to create macro feature without geometry with custom error messages + +[C#](DimensionWatcher/cs) \ No newline at end of file diff --git a/SqlDbEfNetCore/cs/SqlDbEfNetCore.csproj b/SqlDbEfNetCore/cs/SqlDbEfNetCore.csproj index 8391622..183e48a 100644 --- a/SqlDbEfNetCore/cs/SqlDbEfNetCore.csproj +++ b/SqlDbEfNetCore/cs/SqlDbEfNetCore.csproj @@ -10,7 +10,7 @@ - + diff --git a/SweepSketch/cs/SweepSketchAddIn.cs b/SweepSketch/cs/SweepSketchAddIn.cs index e85ad13..ed9b696 100644 --- a/SweepSketch/cs/SweepSketchAddIn.cs +++ b/SweepSketch/cs/SweepSketchAddIn.cs @@ -97,7 +97,9 @@ public override ISwBody[] CreateGeometry(ISwApplication app, ISwDocument model, var profile = app.MemoryGeometryBuilder.CreateCircle(startPt, normalAtPoint, data.Radius * 2); - var region = app.MemoryGeometryBuilder.CreatePlanarSheet(profile).Bodies.First(); + var profileRegion = app.MemoryGeometryBuilder.CreateRegionFromSegments(profile); + + var region = app.MemoryGeometryBuilder.CreatePlanarSheet(profileRegion).Bodies.First(); var sweep = app.MemoryGeometryBuilder.CreateSolidSweep(path, region); diff --git a/SweepSketch/cs/SweepSketchAddIn.csproj b/SweepSketch/cs/SweepSketchAddIn.csproj index b37832e..78fa830 100644 --- a/SweepSketch/cs/SweepSketchAddIn.csproj +++ b/SweepSketch/cs/SweepSketchAddIn.csproj @@ -59,14 +59,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -92,11 +92,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/SweepSketch/cs/packages.config b/SweepSketch/cs/packages.config index 2a78f17..2d28f6b 100644 --- a/SweepSketch/cs/packages.config +++ b/SweepSketch/cs/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/TaskPaneAddIn/cs/SwTaskPaneAddIn.csproj b/TaskPaneAddIn/cs/SwTaskPaneAddIn.csproj index 9e4f1b3..7b0301d 100644 --- a/TaskPaneAddIn/cs/SwTaskPaneAddIn.csproj +++ b/TaskPaneAddIn/cs/SwTaskPaneAddIn.csproj @@ -86,14 +86,14 @@ - - packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll packages\Xarial.XToolkit.0.2.20\lib\net461\Xarial.XToolkit.dll @@ -140,11 +140,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/TaskPaneAddIn/cs/packages.config b/TaskPaneAddIn/cs/packages.config index 3344432..359fb92 100644 --- a/TaskPaneAddIn/cs/packages.config +++ b/TaskPaneAddIn/cs/packages.config @@ -1,10 +1,10 @@  - - + + - + \ No newline at end of file diff --git a/ToggleCommand/cs/ToggleCommand/ToggleCommand.csproj b/ToggleCommand/cs/ToggleCommand/ToggleCommand.csproj index 4c64e5a..acb19e5 100644 --- a/ToggleCommand/cs/ToggleCommand/ToggleCommand.csproj +++ b/ToggleCommand/cs/ToggleCommand/ToggleCommand.csproj @@ -59,14 +59,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -89,11 +89,11 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/ToggleCommand/cs/ToggleCommand/packages.config b/ToggleCommand/cs/ToggleCommand/packages.config index 2a78f17..2d28f6b 100644 --- a/ToggleCommand/cs/ToggleCommand/packages.config +++ b/ToggleCommand/cs/ToggleCommand/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/TopTenList2020/cs/ttl/ShaftChamferMacroFeatureDefinition.cs b/TopTenList2020/cs/ttl/ShaftChamferMacroFeatureDefinition.cs index c47b147..b23f3cb 100644 --- a/TopTenList2020/cs/ttl/ShaftChamferMacroFeatureDefinition.cs +++ b/TopTenList2020/cs/ttl/ShaftChamferMacroFeatureDefinition.cs @@ -42,7 +42,7 @@ public override ISwBody[] CreateGeometry(ISwApplication app, ISwDocument model, if (isPreview) { - targBody = targBody.ToTempBody(); + targBody = (ISwBody)targBody.Copy(); } var result = targBody.Substract(cylBody.Substract(coneBody).First()).First(); diff --git a/TopTenList2020/cs/ttl/packages.config b/TopTenList2020/cs/ttl/packages.config index 2a78f17..2d28f6b 100644 --- a/TopTenList2020/cs/ttl/packages.config +++ b/TopTenList2020/cs/ttl/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/TopTenList2020/cs/ttl/ttl.csproj b/TopTenList2020/cs/ttl/ttl.csproj index d6fcb22..54a921a 100644 --- a/TopTenList2020/cs/ttl/ttl.csproj +++ b/TopTenList2020/cs/ttl/ttl.csproj @@ -60,14 +60,14 @@ - - ..\packages\Xarial.XCad.0.7.4\lib\net461\Xarial.XCad.dll + + ..\packages\Xarial.XCad.0.7.5\lib\net461\Xarial.XCad.dll - - ..\packages\Xarial.XCad.SolidWorks.0.7.4\lib\net461\Xarial.XCad.SolidWorks.dll + + ..\packages\Xarial.XCad.SolidWorks.0.7.5\lib\net461\Xarial.XCad.SolidWorks.dll - - ..\packages\Xarial.XCad.Toolkit.0.7.4\lib\net461\Xarial.XCad.Toolkit.dll + + ..\packages\Xarial.XCad.Toolkit.0.7.5\lib\net461\Xarial.XCad.Toolkit.dll @@ -99,12 +99,12 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - +