diff --git a/Analysis/Tests/Connectivity.Tests/Connectivity.Tests.csproj b/Analysis/Tests/Connectivity.Tests/Connectivity.Tests.csproj index 2b3160bc..2b628182 100644 --- a/Analysis/Tests/Connectivity.Tests/Connectivity.Tests.csproj +++ b/Analysis/Tests/Connectivity.Tests/Connectivity.Tests.csproj @@ -17,8 +17,8 @@ - - - + + + \ No newline at end of file diff --git a/AnyText/AnyText.Lsp/AnyText.Lsp.csproj b/AnyText/AnyText.Lsp/AnyText.Lsp.csproj index 1e5e7f18..0ed8c5cf 100644 --- a/AnyText/AnyText.Lsp/AnyText.Lsp.csproj +++ b/AnyText/AnyText.Lsp/AnyText.Lsp.csproj @@ -16,7 +16,7 @@ - + diff --git a/AnyText/AnyText.history b/AnyText/AnyText.history index 81d621bb..f4fc7733 100644 --- a/AnyText/AnyText.history +++ b/AnyText/AnyText.history @@ -49,4 +49,5 @@ major: changed extension API for indentation-aware, create API to propagate cont patch: do not check whether rule application is memoized if it is only interesting to see whether the line is obsolete patch: adapt metamodel code to changed interface patch: improve error reporting -patch: update StreamJsonRpc version, improve error reporting \ No newline at end of file +patch: update StreamJsonRpc version, improve error reporting +patch: update dependencies \ No newline at end of file diff --git a/AnyText/NMF-Anytext-LSP.nuspec b/AnyText/NMF-Anytext-LSP.nuspec index 2343f66f..db07e2fe 100644 --- a/AnyText/NMF-Anytext-LSP.nuspec +++ b/AnyText/NMF-Anytext-LSP.nuspec @@ -23,16 +23,16 @@ - - + + - - + + diff --git a/AnyText/Tests/AnyText.Tests/AnyText.Tests.csproj b/AnyText/Tests/AnyText.Tests/AnyText.Tests.csproj index 671ed5f9..115cc5f1 100644 --- a/AnyText/Tests/AnyText.Tests/AnyText.Tests.csproj +++ b/AnyText/Tests/AnyText.Tests/AnyText.Tests.csproj @@ -51,14 +51,14 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Collections/Collections.Test/Collections.Test.csproj b/Collections/Collections.Test/Collections.Test.csproj index 815e3425..7f57ed1b 100644 --- a/Collections/Collections.Test/Collections.Test.csproj +++ b/Collections/Collections.Test/Collections.Test.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/Expressions/Tests/Expressions.Chunk.Test/Expressions.Chunk.Test.csproj b/Expressions/Tests/Expressions.Chunk.Test/Expressions.Chunk.Test.csproj index e9f9b394..140c3c1b 100644 --- a/Expressions/Tests/Expressions.Chunk.Test/Expressions.Chunk.Test.csproj +++ b/Expressions/Tests/Expressions.Chunk.Test/Expressions.Chunk.Test.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/Expressions/Tests/Expressions.Configuration.Test/Expressions.Configuration.Test.csproj b/Expressions/Tests/Expressions.Configuration.Test/Expressions.Configuration.Test.csproj index 56aa357c..554c6a45 100644 --- a/Expressions/Tests/Expressions.Configuration.Test/Expressions.Configuration.Test.csproj +++ b/Expressions/Tests/Expressions.Configuration.Test/Expressions.Configuration.Test.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/Expressions/Tests/Expressions.Linq.Tests/Expressions.Linq.Test.csproj b/Expressions/Tests/Expressions.Linq.Tests/Expressions.Linq.Test.csproj index a335e93c..dac13b7f 100644 --- a/Expressions/Tests/Expressions.Linq.Tests/Expressions.Linq.Test.csproj +++ b/Expressions/Tests/Expressions.Linq.Tests/Expressions.Linq.Test.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Expressions/Tests/Expressions.Test/Expressions.Test.csproj b/Expressions/Tests/Expressions.Test/Expressions.Test.csproj index 065cf732..6d5f42f8 100644 --- a/Expressions/Tests/Expressions.Test/Expressions.Test.csproj +++ b/Expressions/Tests/Expressions.Test/Expressions.Test.csproj @@ -7,9 +7,9 @@ NMF.Expressions.Test - - - + + + diff --git a/Expressions/Tests/Expressions.Utilities.Tests/Expressions.Utilities.Tests.csproj b/Expressions/Tests/Expressions.Utilities.Tests/Expressions.Utilities.Tests.csproj index 16675b9d..aec0aa32 100644 --- a/Expressions/Tests/Expressions.Utilities.Tests/Expressions.Utilities.Tests.csproj +++ b/Expressions/Tests/Expressions.Utilities.Tests/Expressions.Utilities.Tests.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/Expressions/Tests/Models.Expressions.Tests/Expressions.Models.Tests.csproj b/Expressions/Tests/Models.Expressions.Tests/Expressions.Models.Tests.csproj index dececb14..d7622ec0 100644 --- a/Expressions/Tests/Models.Expressions.Tests/Expressions.Models.Tests.csproj +++ b/Expressions/Tests/Models.Expressions.Tests/Expressions.Models.Tests.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/Glsp/GLSP.history b/Glsp/GLSP.history index 37bae777..2e7a7012 100644 --- a/Glsp/GLSP.history +++ b/Glsp/GLSP.history @@ -18,4 +18,5 @@ patch: fix nuspec file to include correct StreamJsonRpc package version patch: fix nodes within compartments patch: Add support for .NET 10 patch: adapt metamodel code to changed interface -patch: update StreamJsonRpc dependency \ No newline at end of file +patch: update StreamJsonRpc dependency +patch: update dependencies \ No newline at end of file diff --git a/Glsp/Glsp/Glsp.csproj b/Glsp/Glsp/Glsp.csproj index 5ba14e73..4717281f 100644 --- a/Glsp/Glsp/Glsp.csproj +++ b/Glsp/Glsp/Glsp.csproj @@ -16,7 +16,7 @@ - + diff --git a/Glsp/NMF-GLSP-Core.nuspec b/Glsp/NMF-GLSP-Core.nuspec index 924b3b9f..f9cf51b9 100644 --- a/Glsp/NMF-GLSP-Core.nuspec +++ b/Glsp/NMF-GLSP-Core.nuspec @@ -22,15 +22,15 @@ - - + + - - + + diff --git a/Glsp/NMetaGlspEditor/NMetaGlspEditor.Server/NMetaGlspEditor.Server.csproj b/Glsp/NMetaGlspEditor/NMetaGlspEditor.Server/NMetaGlspEditor.Server.csproj index 0f4909c4..3dcfd153 100644 --- a/Glsp/NMetaGlspEditor/NMetaGlspEditor.Server/NMetaGlspEditor.Server.csproj +++ b/Glsp/NMetaGlspEditor/NMetaGlspEditor.Server/NMetaGlspEditor.Server.csproj @@ -17,9 +17,9 @@ - 10.0.6 + 10.0.8 - + diff --git a/Glsp/Tests/GlspTests/GlspTests.csproj b/Glsp/Tests/GlspTests/GlspTests.csproj index 879afabf..054dc109 100644 --- a/Glsp/Tests/GlspTests/GlspTests.csproj +++ b/Glsp/Tests/GlspTests/GlspTests.csproj @@ -10,14 +10,14 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/IntegrationTests/ComponentBasedSoftwareArchitectures/ComponentBasedSoftwareArchitectures.csproj b/IntegrationTests/ComponentBasedSoftwareArchitectures/ComponentBasedSoftwareArchitectures.csproj index 13e85190..fd4e99bf 100644 --- a/IntegrationTests/ComponentBasedSoftwareArchitectures/ComponentBasedSoftwareArchitectures.csproj +++ b/IntegrationTests/ComponentBasedSoftwareArchitectures/ComponentBasedSoftwareArchitectures.csproj @@ -38,8 +38,8 @@ - - - + + + \ No newline at end of file diff --git a/IntegrationTests/IncrementalizationTests/IncrementalizationTests.csproj b/IntegrationTests/IncrementalizationTests/IncrementalizationTests.csproj index 90c71370..ecf49047 100644 --- a/IntegrationTests/IncrementalizationTests/IncrementalizationTests.csproj +++ b/IntegrationTests/IncrementalizationTests/IncrementalizationTests.csproj @@ -21,8 +21,8 @@ - - - + + + \ No newline at end of file diff --git a/Interop/EcoreInterop.Tests/EcoreInterop.Tests.csproj b/Interop/EcoreInterop.Tests/EcoreInterop.Tests.csproj index c9df1c1c..e2a5a8f7 100644 --- a/Interop/EcoreInterop.Tests/EcoreInterop.Tests.csproj +++ b/Interop/EcoreInterop.Tests/EcoreInterop.Tests.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/Models/Models.Tests/Models.Tests.csproj b/Models/Models.Tests/Models.Tests.csproj index 9b8fe247..b8780309 100644 --- a/Models/Models.Tests/Models.Tests.csproj +++ b/Models/Models.Tests/Models.Tests.csproj @@ -25,9 +25,9 @@ - - - + + + diff --git a/Models/ModelsTests.history b/Models/ModelsTests.history index ea12d819..8d5b75b7 100644 --- a/Models/ModelsTests.history +++ b/Models/ModelsTests.history @@ -14,4 +14,5 @@ component NMF-Tests.NUnit.nuspec from Tests/Models.Tests.NUnit/Properties/Assemb patch (2.0.457): Start using EtiCat patch: Add support for .NET 10 patch: adapt to changed models +patch: update dependencies patch: update dependencies \ No newline at end of file diff --git a/Models/Serialization.Json/Serialization.Json.csproj b/Models/Serialization.Json/Serialization.Json.csproj index 2c06e11e..1ac10408 100644 --- a/Models/Serialization.Json/Serialization.Json.csproj +++ b/Models/Serialization.Json/Serialization.Json.csproj @@ -26,7 +26,7 @@ - + diff --git a/Models/Tests/Models.Tests.Dynamic/Models.Tests.Dynamic.csproj b/Models/Tests/Models.Tests.Dynamic/Models.Tests.Dynamic.csproj index b8997c23..0f0fa3ad 100644 --- a/Models/Tests/Models.Tests.Dynamic/Models.Tests.Dynamic.csproj +++ b/Models/Tests/Models.Tests.Dynamic/Models.Tests.Dynamic.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/Models/Tests/Models.Tests.Json/Models.Tests.Json.csproj b/Models/Tests/Models.Tests.Json/Models.Tests.Json.csproj index 4679eb8e..680ffc78 100644 --- a/Models/Tests/Models.Tests.Json/Models.Tests.Json.csproj +++ b/Models/Tests/Models.Tests.Json/Models.Tests.Json.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Models/Tests/Models.Tests.MSTest/Models.Tests.MSTest.csproj b/Models/Tests/Models.Tests.MSTest/Models.Tests.MSTest.csproj index e7ffc8e3..1d52278e 100644 --- a/Models/Tests/Models.Tests.MSTest/Models.Tests.MSTest.csproj +++ b/Models/Tests/Models.Tests.MSTest/Models.Tests.MSTest.csproj @@ -13,8 +13,8 @@ - - + + diff --git a/Models/Tests/Models.Tests.NUnit/ModelTest.cs b/Models/Tests/Models.Tests.NUnit/ModelTest.cs index 8df1cd4e..184b7068 100644 --- a/Models/Tests/Models.Tests.NUnit/ModelTest.cs +++ b/Models/Tests/Models.Tests.NUnit/ModelTest.cs @@ -32,7 +32,7 @@ protected override void AssertIsTrue(bool condition, string message = null) /// protected override void AssertThrowsException(Action toPerform, string message = null) { - Assert.Throws(() => toPerform(), message); + Assert.Throws(new Action(() => toPerform()), message); } /// diff --git a/Models/Tests/Models.Tests.NUnit/Models.Tests.NUnit.csproj b/Models/Tests/Models.Tests.NUnit/Models.Tests.NUnit.csproj index 5ab0a546..2215c4c6 100644 --- a/Models/Tests/Models.Tests.NUnit/Models.Tests.NUnit.csproj +++ b/Models/Tests/Models.Tests.NUnit/Models.Tests.NUnit.csproj @@ -1,4 +1,4 @@ - + net48;net9.0;net10.0 @@ -13,7 +13,7 @@ - + diff --git a/Optimizations/Tests/Optimizations.Tests/Optimizations.Tests.csproj b/Optimizations/Tests/Optimizations.Tests/Optimizations.Tests.csproj index 0bff3886..a9c2d183 100644 --- a/Optimizations/Tests/Optimizations.Tests/Optimizations.Tests.csproj +++ b/Optimizations/Tests/Optimizations.Tests/Optimizations.Tests.csproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/Services/NMF-ModelServices.nuspec b/Services/NMF-ModelServices.nuspec index 7ad3b539..d1afca51 100644 --- a/Services/NMF-ModelServices.nuspec +++ b/Services/NMF-ModelServices.nuspec @@ -21,14 +21,14 @@ - - + + - - + + diff --git a/Services/NMF-PropertyService.nuspec b/Services/NMF-PropertyService.nuspec index a2bfd25e..93770690 100644 --- a/Services/NMF-PropertyService.nuspec +++ b/Services/NMF-PropertyService.nuspec @@ -19,14 +19,14 @@ - - - + + + - - - + + + diff --git a/Services/PropertyService/PropertyService.csproj b/Services/PropertyService/PropertyService.csproj index c37cccfb..6f7c373a 100644 --- a/Services/PropertyService/PropertyService.csproj +++ b/Services/PropertyService/PropertyService.csproj @@ -34,8 +34,8 @@ - - + + diff --git a/Services/Services.history b/Services/Services.history index a849bdff..35c622c3 100644 --- a/Services/Services.history +++ b/Services/Services.history @@ -20,3 +20,4 @@ minor: add property to access local path of a session patch: Add support for .NET 10 patch: adapt to models interface patch: update system dependencies +patch: update dependencies diff --git a/Services/Tests/ModelServicesTests/ModelServicesTests.csproj b/Services/Tests/ModelServicesTests/ModelServicesTests.csproj index 8f513d03..4b5107e1 100644 --- a/Services/Tests/ModelServicesTests/ModelServicesTests.csproj +++ b/Services/Tests/ModelServicesTests/ModelServicesTests.csproj @@ -10,9 +10,9 @@ ..\..\Build\Tests\ - - - + + + diff --git a/Synchronizations/Synchronizations.Models.Tests/Synchronizations.Models.Tests.csproj b/Synchronizations/Synchronizations.Models.Tests/Synchronizations.Models.Tests.csproj index 68d05614..e942b1b7 100644 --- a/Synchronizations/Synchronizations.Models.Tests/Synchronizations.Models.Tests.csproj +++ b/Synchronizations/Synchronizations.Models.Tests/Synchronizations.Models.Tests.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/Synchronizations/Synchronizations.Tests/Synchronizations.Tests.csproj b/Synchronizations/Synchronizations.Tests/Synchronizations.Tests.csproj index 6f3affa2..42f19aa3 100644 --- a/Synchronizations/Synchronizations.Tests/Synchronizations.Tests.csproj +++ b/Synchronizations/Synchronizations.Tests/Synchronizations.Tests.csproj @@ -28,9 +28,9 @@ - - - + + + diff --git a/Tools/Ecore2Code.history b/Tools/Ecore2Code.history index fe4e5728..8e62f0c4 100644 --- a/Tools/Ecore2Code.history +++ b/Tools/Ecore2Code.history @@ -12,3 +12,4 @@ patch: Print loading errors to stderr patch: Add option to save NMeta metamodel patch: adapt to models interface patch: update system dependencies +patch: update dependencies diff --git a/Tools/Ecore2Code/Ecore2Code.csproj b/Tools/Ecore2Code/Ecore2Code.csproj index 4d2c361d..47901e4f 100644 --- a/Tools/Ecore2Code/Ecore2Code.csproj +++ b/Tools/Ecore2Code/Ecore2Code.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/Tools/Tests/Tests.csproj b/Tools/Tests/Tests.csproj index 362529de..13a53727 100644 --- a/Tools/Tests/Tests.csproj +++ b/Tools/Tests/Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/Tools/Utilities.Tests/Utilities.Tests.csproj b/Tools/Utilities.Tests/Utilities.Tests.csproj index b9a82fc8..1453f6ed 100644 --- a/Tools/Utilities.Tests/Utilities.Tests.csproj +++ b/Tools/Utilities.Tests/Utilities.Tests.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/Transformations/CodeGen.history b/Transformations/CodeGen.history index 9d3c33d9..10d04bc4 100644 --- a/Transformations/CodeGen.history +++ b/Transformations/CodeGen.history @@ -12,4 +12,5 @@ component NMF-CodeGen.nuspec from CodeGen/Properties/AssemblyInfo.cs patch (2.0.457): Start using EtiCat patch: Add support for .NET 10 patch: improve code generation for child elements -patch: update system dependencies \ No newline at end of file +patch: update system dependencies +patch: update dependencies \ No newline at end of file diff --git a/Transformations/CodeGen/CodeGen.csproj b/Transformations/CodeGen/CodeGen.csproj index fcdb087e..c516dd11 100644 --- a/Transformations/CodeGen/CodeGen.csproj +++ b/Transformations/CodeGen/CodeGen.csproj @@ -20,7 +20,7 @@ - + diff --git a/Transformations/NMF-CodeGen.nuspec b/Transformations/NMF-CodeGen.nuspec index 95ec838e..6ec0269d 100644 --- a/Transformations/NMF-CodeGen.nuspec +++ b/Transformations/NMF-CodeGen.nuspec @@ -23,24 +23,24 @@ - - + + - - + + - - + + diff --git a/Transformations/Tests/CodeGenerationTests/CodeGenerationTests.csproj b/Transformations/Tests/CodeGenerationTests/CodeGenerationTests.csproj index d9b27d64..886c6e08 100644 --- a/Transformations/Tests/CodeGenerationTests/CodeGenerationTests.csproj +++ b/Transformations/Tests/CodeGenerationTests/CodeGenerationTests.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/Transformations/Transformations.Tests/Transformations.Tests.csproj b/Transformations/Transformations.Tests/Transformations.Tests.csproj index d0e13357..cf953f24 100644 --- a/Transformations/Transformations.Tests/Transformations.Tests.csproj +++ b/Transformations/Transformations.Tests/Transformations.Tests.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml b/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml index a80ad227..b8d0c6db 100644 --- a/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml +++ b/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml @@ -3,8 +3,10 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:converters="clr-namespace:NMF.Controls.Converters" + xmlns:local="clr-namespace:NMF.Controls" mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="300" x:Class="NMF.Controls.CollectionEditorDialog" + x:DataType="local:CollectionViewModel" Name="self" Title="Edit Collection" Height="300" Width="300"> diff --git a/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml.cs b/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml.cs index f6a942f5..f7bd7bc6 100644 --- a/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml.cs +++ b/UserInterfaces/Controls.Avalonia/CollectionEditorDialog.axaml.cs @@ -38,7 +38,7 @@ public IDataTemplate ItemTemplate /// /// The ItemTemplate Dependency property /// - public static readonly AvaloniaProperty ItemTemplateProperty = + public static readonly AvaloniaProperty ItemTemplateProperty = AvaloniaProperty.Register("ItemTemplate"); private void AddItems(object sender, RoutedEventArgs e) diff --git a/UserInterfaces/Controls.Avalonia/Controls.Avalonia.csproj b/UserInterfaces/Controls.Avalonia/Controls.Avalonia.csproj index 7ee0b9be..94b8c753 100644 --- a/UserInterfaces/Controls.Avalonia/Controls.Avalonia.csproj +++ b/UserInterfaces/Controls.Avalonia/Controls.Avalonia.csproj @@ -16,7 +16,7 @@ - 11.3.11.1 + 12.0.4.1 diff --git a/UserInterfaces/Controls.history b/UserInterfaces/Controls.history index 3c3fa9df..9cd8b7ed 100644 --- a/UserInterfaces/Controls.history +++ b/UserInterfaces/Controls.history @@ -14,3 +14,4 @@ patch (2.0.457): Start using EtiCat patch: Add support for .NET 10 patch: adapt to changed models interface patch: update system dependencies +patch: update dependencies diff --git a/UserInterfaces/Editor.Avalonia/Editor.Avalonia.csproj b/UserInterfaces/Editor.Avalonia/Editor.Avalonia.csproj index fc7f8bf2..ebf77780 100644 --- a/UserInterfaces/Editor.Avalonia/Editor.Avalonia.csproj +++ b/UserInterfaces/Editor.Avalonia/Editor.Avalonia.csproj @@ -10,12 +10,12 @@ - - - - + + + + - + None All diff --git a/UserInterfaces/NMF-Controls-Avalonia.nuspec b/UserInterfaces/NMF-Controls-Avalonia.nuspec index cdf97e1e..e36560f7 100644 --- a/UserInterfaces/NMF-Controls-Avalonia.nuspec +++ b/UserInterfaces/NMF-Controls-Avalonia.nuspec @@ -21,12 +21,12 @@ - + - +