From 1845332abbda24da6ab06cd49a18d982c3b3736d Mon Sep 17 00:00:00 2001 From: nhab Date: Mon, 5 Jun 2023 16:33:34 +0330 Subject: [PATCH 1/4] .Net framework upgraded to 4.81 --- src/Applications/RTFRevit/RTFRevit.csproj | 12 ++++++------ .../Properties/Resources.Designer.cs | 4 ++-- .../Properties/Settings.Designer.cs | 4 ++-- .../RevitTestFrameworkGUI.csproj | 4 +++- src/Applications/RevitTestFrameworkGUI/app.config | 3 +++ src/Framework/Runner/Runner.csproj | 3 ++- src/RevitTestFramework.sln | 11 ++++++++--- src/Tests/RunnerTests/RunnerTests.csproj | 2 +- src/Tests/Samples/SampleTests.csproj | 12 ++++++------ 9 files changed, 33 insertions(+), 22 deletions(-) create mode 100644 src/Applications/RevitTestFrameworkGUI/app.config diff --git a/src/Applications/RTFRevit/RTFRevit.csproj b/src/Applications/RTFRevit/RTFRevit.csproj index cb43bfd2..b9e5ec0b 100644 --- a/src/Applications/RTFRevit/RTFRevit.csproj +++ b/src/Applications/RTFRevit/RTFRevit.csproj @@ -41,7 +41,7 @@ - $(REVITAPI)\AdWindows.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll False @@ -55,23 +55,23 @@ ..\..\..\lib\NUnit\nunit.core.interfaces.dll - $(REVITAPI)\RevitAPI.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll False - $(REVITAPI)\RevitAPIIFC.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll False - $(REVITAPI)\RevitAPIMacros.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIMacros.dll False - $(REVITAPI)\RevitAPIUI.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll False - $(REVITAPI)\RevitAPIUIMacros.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll False diff --git a/src/Applications/RevitTestFrameworkGUI/Properties/Resources.Designer.cs b/src/Applications/RevitTestFrameworkGUI/Properties/Resources.Designer.cs index 0339ff44..83751133 100644 --- a/src/Applications/RevitTestFrameworkGUI/Properties/Resources.Designer.cs +++ b/src/Applications/RevitTestFrameworkGUI/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace RTF.Applications.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/src/Applications/RevitTestFrameworkGUI/Properties/Settings.Designer.cs b/src/Applications/RevitTestFrameworkGUI/Properties/Settings.Designer.cs index 4616116e..cc5bab7c 100644 --- a/src/Applications/RevitTestFrameworkGUI/Properties/Settings.Designer.cs +++ b/src/Applications/RevitTestFrameworkGUI/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34014 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace RTF.Applications.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.5.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj b/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj index c8111913..79bb6769 100644 --- a/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj +++ b/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj @@ -20,6 +20,7 @@ + v4.8.1 AnyCPU @@ -53,7 +54,7 @@ ..\..\..\lib\Microsoft.Practices.Prism.dll - $(REVITAPI)\RevitAddInUtility.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll @@ -104,6 +105,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer diff --git a/src/Applications/RevitTestFrameworkGUI/app.config b/src/Applications/RevitTestFrameworkGUI/app.config new file mode 100644 index 00000000..eca069e4 --- /dev/null +++ b/src/Applications/RevitTestFrameworkGUI/app.config @@ -0,0 +1,3 @@ + + + diff --git a/src/Framework/Runner/Runner.csproj b/src/Framework/Runner/Runner.csproj index d501863d..0dfeb1e7 100644 --- a/src/Framework/Runner/Runner.csproj +++ b/src/Framework/Runner/Runner.csproj @@ -18,6 +18,7 @@ + v4.8.1 true @@ -55,7 +56,7 @@ - $(REVITAPI)\RevitAddInUtility.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll diff --git a/src/RevitTestFramework.sln b/src/RevitTestFramework.sln index e675eed3..d0e33473 100644 --- a/src/RevitTestFramework.sln +++ b/src/RevitTestFramework.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33627.172 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{72627E9C-00D7-42F7-B004-2E427B67E4C9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{54065D85-938B-4AAE-B98F-74994F717347}" @@ -68,11 +70,14 @@ Global GlobalSection(NestedProjects) = preSolution {D21140F7-D29A-4265-A679-BA76770B7257} = {72627E9C-00D7-42F7-B004-2E427B67E4C9} {D1D93A41-6635-48ED-8220-D372A24EC581} = {72627E9C-00D7-42F7-B004-2E427B67E4C9} - {61EAF84C-49D2-4CDF-A4F9-CEAC6B6F2166} = {72627E9C-00D7-42F7-B004-2E427B67E4C9} {C379B8FE-C170-442C-8038-206859A023D4} = {54065D85-938B-4AAE-B98F-74994F717347} {BE4EB3BC-1593-4404-8402-FB831F3FEE42} = {54065D85-938B-4AAE-B98F-74994F717347} - {69DAA31B-32DE-4C70-A959-406A08158B63} = {54065D85-938B-4AAE-B98F-74994F717347} {745CCA0F-549E-4756-A31E-41BF7F905B8A} = {1D1602E5-004F-4D18-8AB9-90D746921E60} {4A25BB46-081A-4ACD-9C38-297CD800550F} = {1D1602E5-004F-4D18-8AB9-90D746921E60} + {61EAF84C-49D2-4CDF-A4F9-CEAC6B6F2166} = {72627E9C-00D7-42F7-B004-2E427B67E4C9} + {69DAA31B-32DE-4C70-A959-406A08158B63} = {54065D85-938B-4AAE-B98F-74994F717347} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C95979E3-CB22-44CA-9764-21D2E4EF5D6D} EndGlobalSection EndGlobal diff --git a/src/Tests/RunnerTests/RunnerTests.csproj b/src/Tests/RunnerTests/RunnerTests.csproj index 085d05a2..3968d973 100644 --- a/src/Tests/RunnerTests/RunnerTests.csproj +++ b/src/Tests/RunnerTests/RunnerTests.csproj @@ -44,7 +44,7 @@ ..\..\..\lib\NUnit\nunit.framework.dll - $(REVITAPI)\RevitAddInUtility.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll diff --git a/src/Tests/Samples/SampleTests.csproj b/src/Tests/Samples/SampleTests.csproj index 529ed241..d4634e0e 100644 --- a/src/Tests/Samples/SampleTests.csproj +++ b/src/Tests/Samples/SampleTests.csproj @@ -37,7 +37,7 @@ - $(REVITAPI)\AdWindows.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll False @@ -45,23 +45,23 @@ ..\..\..\lib\NUnit\nunit.framework.dll - $(REVITAPI)\RevitAPI.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll False - $(REVITAPI)\RevitAPIIFC.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll False - $(REVITAPI)\RevitAPIMacros.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIMacros.dll False - $(REVITAPI)\RevitAPIUI.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll False - $(REVITAPI)\RevitAPIUIMacros.dll + ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll False From fa657c7d82363d6044ab69f28170598e8c04cabd Mon Sep 17 00:00:00 2001 From: nhab Date: Mon, 5 Jun 2023 16:42:34 +0330 Subject: [PATCH 2/4] Revit2022 dlls added --- src/Applications/RTFRevit/RTFRevit.csproj | 12 ++++++------ .../RevitTestFrameworkGUI.csproj | 5 ++++- src/Framework/Runner/Runner.csproj | 2 +- src/Tests/RunnerTests/RunnerTests.csproj | 3 +++ src/Tests/Samples/SampleTests.csproj | 10 +++++----- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/Applications/RTFRevit/RTFRevit.csproj b/src/Applications/RTFRevit/RTFRevit.csproj index b9e5ec0b..5cb9a915 100644 --- a/src/Applications/RTFRevit/RTFRevit.csproj +++ b/src/Applications/RTFRevit/RTFRevit.csproj @@ -41,7 +41,7 @@ - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll False @@ -55,23 +55,23 @@ ..\..\..\lib\NUnit\nunit.core.interfaces.dll - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIMacros.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIMacros.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll False diff --git a/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj b/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj index 79bb6769..66e60a16 100644 --- a/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj +++ b/src/Applications/RevitTestFrameworkGUI/RevitTestFrameworkGUI.csproj @@ -54,7 +54,7 @@ ..\..\..\lib\Microsoft.Practices.Prism.dll - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll @@ -124,6 +124,9 @@ + + + diff --git a/src/Framework/Runner/Runner.csproj b/src/Framework/Runner/Runner.csproj index 0dfeb1e7..6083717c 100644 --- a/src/Framework/Runner/Runner.csproj +++ b/src/Framework/Runner/Runner.csproj @@ -56,7 +56,7 @@ - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAddInUtility.dll diff --git a/src/Tests/RunnerTests/RunnerTests.csproj b/src/Tests/RunnerTests/RunnerTests.csproj index 3968d973..00972b9e 100644 --- a/src/Tests/RunnerTests/RunnerTests.csproj +++ b/src/Tests/RunnerTests/RunnerTests.csproj @@ -35,6 +35,9 @@ false + + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll + False ..\..\..\lib\Moq\Moq.dll diff --git a/src/Tests/Samples/SampleTests.csproj b/src/Tests/Samples/SampleTests.csproj index d4634e0e..f32b53e4 100644 --- a/src/Tests/Samples/SampleTests.csproj +++ b/src/Tests/Samples/SampleTests.csproj @@ -37,7 +37,7 @@ - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\AdWindows.dll False @@ -45,11 +45,11 @@ ..\..\..\lib\NUnit\nunit.framework.dll - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPI.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIIFC.dll False @@ -57,11 +57,11 @@ False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUI.dll False - ..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll + ..\..\..\..\..\..\..\..\..\..\Program Files\Autodesk\Revit 2022\RevitAPIUIMacros.dll False From 3d8a3f717c5ae014ed9803dc437e8c2fa77e4cae Mon Sep 17 00:00:00 2001 From: nhab Date: Mon, 5 Jun 2023 16:56:52 +0330 Subject: [PATCH 3/4] Revit 2022 dlls --- src/Applications/RTFRevit/RTFRevit.csproj | 1 + .../RevitTestFrameworkApp/RevitTestFrameworkConsole.csproj | 2 ++ src/Applications/RevitTestFrameworkApp/app.config | 3 +++ .../RevitTestFramework/RevitTestFrameworkTypes.csproj | 1 + src/TestSetup/SampleTestsSetup.csproj | 2 ++ src/Tests/RunnerTests/RunnerTests.csproj | 1 + src/Tests/Samples/SampleTests.csproj | 1 + 7 files changed, 11 insertions(+) create mode 100644 src/Applications/RevitTestFrameworkApp/app.config diff --git a/src/Applications/RTFRevit/RTFRevit.csproj b/src/Applications/RTFRevit/RTFRevit.csproj index 5cb9a915..cbd3c25f 100644 --- a/src/Applications/RTFRevit/RTFRevit.csproj +++ b/src/Applications/RTFRevit/RTFRevit.csproj @@ -19,6 +19,7 @@ None + v4.8.1 true diff --git a/src/Applications/RevitTestFrameworkApp/RevitTestFrameworkConsole.csproj b/src/Applications/RevitTestFrameworkApp/RevitTestFrameworkConsole.csproj index ef801272..d458e971 100644 --- a/src/Applications/RevitTestFrameworkApp/RevitTestFrameworkConsole.csproj +++ b/src/Applications/RevitTestFrameworkApp/RevitTestFrameworkConsole.csproj @@ -18,6 +18,7 @@ + v4.8.1 AnyCPU @@ -61,6 +62,7 @@ + diff --git a/src/Applications/RevitTestFrameworkApp/app.config b/src/Applications/RevitTestFrameworkApp/app.config new file mode 100644 index 00000000..eca069e4 --- /dev/null +++ b/src/Applications/RevitTestFrameworkApp/app.config @@ -0,0 +1,3 @@ + + + diff --git a/src/Framework/RevitTestFramework/RevitTestFrameworkTypes.csproj b/src/Framework/RevitTestFramework/RevitTestFrameworkTypes.csproj index 46a24028..b57a7d83 100644 --- a/src/Framework/RevitTestFramework/RevitTestFrameworkTypes.csproj +++ b/src/Framework/RevitTestFramework/RevitTestFrameworkTypes.csproj @@ -21,6 +21,7 @@ + v4.8.1 pdbonly diff --git a/src/TestSetup/SampleTestsSetup.csproj b/src/TestSetup/SampleTestsSetup.csproj index fa394ee2..d3bc8120 100644 --- a/src/TestSetup/SampleTestsSetup.csproj +++ b/src/TestSetup/SampleTestsSetup.csproj @@ -13,6 +13,8 @@ SampleTestsSetup SampleTestsSetup 512 + v4.8.1 + true diff --git a/src/Tests/RunnerTests/RunnerTests.csproj b/src/Tests/RunnerTests/RunnerTests.csproj index 00972b9e..94073b07 100644 --- a/src/Tests/RunnerTests/RunnerTests.csproj +++ b/src/Tests/RunnerTests/RunnerTests.csproj @@ -14,6 +14,7 @@ RunnerTests 512 + v4.8.1 true diff --git a/src/Tests/Samples/SampleTests.csproj b/src/Tests/Samples/SampleTests.csproj index f32b53e4..d8a9a545 100644 --- a/src/Tests/Samples/SampleTests.csproj +++ b/src/Tests/Samples/SampleTests.csproj @@ -15,6 +15,7 @@ 512 None + v4.8.1 true From 74f06d70e00980e05d61e0a7f932c2a096e17c3a Mon Sep 17 00:00:00 2001 From: nhab Date: Mon, 5 Jun 2023 17:38:41 +0330 Subject: [PATCH 4/4] Color and Dimentions Corrected a bit --- .../RevitTestFrameworkGUI/Converters.cs | 16 ++++++++-------- .../RevitTestFrameworkGUI/MainWindow.xaml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Applications/RevitTestFrameworkGUI/Converters.cs b/src/Applications/RevitTestFrameworkGUI/Converters.cs index 30a2571b..34a888ff 100644 --- a/src/Applications/RevitTestFrameworkGUI/Converters.cs +++ b/src/Applications/RevitTestFrameworkGUI/Converters.cs @@ -87,11 +87,11 @@ public object Convert(object value, Type targetType, case TestStatus.Cancelled: return new SolidColorBrush(Colors.DarkGray); case TestStatus.TimedOut: - return new SolidColorBrush(Colors.Orange); + return new SolidColorBrush(Colors.DarkRed); case TestStatus.Error: - return new SolidColorBrush(Colors.OrangeRed); + return new SolidColorBrush(Colors.DarkRed); case TestStatus.Failure: - return new SolidColorBrush(Colors.OrangeRed); + return new SolidColorBrush(Colors.DarkRed); case TestStatus.Ignored: return Brushes.Transparent; case TestStatus.Inconclusive: @@ -125,11 +125,11 @@ public object Convert(object value, Type targetType, case FixtureStatus.None: return Brushes.Transparent; case FixtureStatus.Mixed: - return new SolidColorBrush(Colors.Orange); + return new SolidColorBrush(Colors.DarkRed); case FixtureStatus.Failure: - return new SolidColorBrush(Colors.OrangeRed); + return new SolidColorBrush(Colors.DarkRed); case FixtureStatus.Success: - return new SolidColorBrush(Colors.GreenYellow); + return new SolidColorBrush(Colors.Green); default: return Brushes.Transparent; } @@ -177,10 +177,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn { if ((bool) value) { - return new SolidColorBrush(Colors.LightGreen); + return new SolidColorBrush(Colors.DarkGreen); } - return new SolidColorBrush(Colors.LightPink); + return new SolidColorBrush(Colors.DarkRed); } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) diff --git a/src/Applications/RevitTestFrameworkGUI/MainWindow.xaml b/src/Applications/RevitTestFrameworkGUI/MainWindow.xaml index 85f58774..9732a8c1 100644 --- a/src/Applications/RevitTestFrameworkGUI/MainWindow.xaml +++ b/src/Applications/RevitTestFrameworkGUI/MainWindow.xaml @@ -6,7 +6,7 @@ xmlns:applications="clr-namespace:RTF.Applications" xmlns:runners="clr-namespace:RTF.Framework;assembly=Runner" xmlns:System="clr-namespace:System;assembly=mscorlib" - mc:Ignorable="d" MinWidth="400" MinHeight="600" Height="800" Width="800" Closing="View_Closing" + mc:Ignorable="d" MinWidth="400" MinHeight="600" Height="480" Width="800" Closing="View_Closing" d:DataContext="{d:DesignInstance applications:RunnerViewModel}" Title="Revit Test Runner" > @@ -339,8 +339,8 @@ - - + +