From 8c17c8c79084bb6ce5d8c09da33c1ea91b5429e2 Mon Sep 17 00:00:00 2001 From: Christoph Hofmann Date: Wed, 14 Jul 2021 19:44:15 +0200 Subject: [PATCH] Reorganized source code in repository (#200) - Moved source code to own src folder - Renamed lib into libraries folder - Adjusted spelling for all VS project folders Signed-off-by: Christoph Hofmann --- .../workflows/actions/app-build/action.yml | 6 +-- .github/workflows/app-release.yml | 4 +- .github/workflows/ci.yml | 6 +-- OpenHAB.Windows.sln | 40 ++++++++---------- {Libs => libaries}/MJPEGDecoderWinRTLib.dll | Bin .../openHAB.Core.Client.csproj | 0 .../openHAB.Core}/AppResources.cs | 0 .../openHAB.Core}/Common/ActionCommand.cs | 0 .../Common/ColorChangedEventArgs.cs | 0 .../openHAB.Core}/Common/ColorHelper.cs | 0 .../openHAB.Core}/Common/Constants.cs | 0 .../openHAB.Core}/Common/DataErrorInfo.cs | 0 .../openHAB.Core}/Common/DeviceFamily.cs | 0 .../openHAB.Core}/Common/DeviceTypeHelper.cs | 0 .../openHAB.Core}/Common/Enum.cs | 0 .../Common/HttpResponseResult.cs | 0 .../Common/ObservableCollectionExtensions.cs | 0 .../openHAB.Core}/Common/OpenHABHttpClient.cs | 0 .../Contracts/IConnectionProfile.cs | 0 .../Services/IDependencyInjectionService.cs | 0 .../Contracts/Services/ISettingsService.cs | 0 .../Messages/FireErrorMessage.cs | 0 .../openHAB.Core}/Messages/FireInfoMessage.cs | 0 .../Messages/ItemStateChangedMessage.cs | 0 .../openHAB.Core}/Messages/MessageType.cs | 0 .../Messages/SettingsUpdatedMessage.cs | 0 .../Messages/SettingsValidationMessage.cs | 0 .../Messages/TriggerCommandMessage.cs | 0 .../Messages/UpdateItemMessage.cs | 0 .../Messages/WidgetClickedMessage.cs | 0 .../Connection/CloudConnectionProfile.cs | 0 .../Connection/DefaultConnectionProfile.cs | 0 .../Model/Connection/DemoConnectionProfile.cs | 0 .../Connection/LocalConnectionProfile.cs | 0 .../Model/Connection/OpenHABConnection.cs | 0 .../Model/Connection/OpenHABHttpClientType.cs | 0 .../Connection/RemoteConnectionProfile.cs | 0 .../Model/Event/EventStreamData.cs | 0 .../Model/Event/EventStreamPayload.cs | 0 .../openHAB.Core}/Model/Event/OpenHABEvent.cs | 0 .../Model/Event/OpenHABEventType.cs | 0 .../openHAB.Core}/Model/Link.cs | 0 .../openHAB.Core}/Model/OpenHABAPIInfo.cs | 0 .../Model/OpenHABCommandDescription.cs | 0 .../Model/OpenHABCommandOptions.cs | 0 .../openHAB.Core}/Model/OpenHABCommands.cs | 0 .../Model/OpenHABConnectionType.cs | 0 .../openHAB.Core}/Model/OpenHABException.cs | 0 .../openHAB.Core}/Model/OpenHABItem.cs | 0 .../openHAB.Core}/Model/OpenHABSitemap.cs | 0 .../openHAB.Core}/Model/OpenHABUrlState.cs | 0 .../openHAB.Core}/Model/OpenHABWidget.cs | 0 .../Model/OpenHABWidgetFactory.cs | 0 .../Model/OpenHABWidgetMapping.cs | 0 .../openHAB.Core}/Model/OpenHabVersion.cs | 0 .../Model/OpenhabConnectionProfile.cs | 0 .../openHAB.Core}/Model/RuntimeInfo.cs | 0 .../openHAB.Core}/Model/Settings.cs | 0 .../openHAB.Core}/Model/WidgetTypeEnum.cs | 0 ....GeneratedMSBuildEditorConfig.editorconfig | 0 .../openHAB.Core}/Openhab.Core.csproj | 0 .../openHAB.Core}/Properties/AssemblyInfo.cs | 0 .../Properties/OpenHAB.Core.rd.xml | 0 .../openHAB.Core}/SDK/IOpenHAB.cs | 0 .../openHAB.Core}/SDK/OpenHABClient.cs | 0 .../openHAB.Core}/Services/AppManager.cs | 0 .../openHAB.Core}/Services/IAppManager.cs | 0 .../openHAB.Core}/Services/IIconCaching.cs | 0 .../openHAB.Core}/Services/IItemManager.cs | 0 .../openHAB.Core}/Services/IconCaching.cs | 0 .../openHAB.Core}/Services/ItemManager.cs | 0 .../Notification/INotificationManager.cs | 0 .../Notification/IOpenHABEventParser.cs | 0 .../Notification/NotificationManager.cs | 0 .../Notification/OpenHABEventParser.cs | 0 .../Notification/TileNotificationSchema.xml | 0 .../Notification/ToastNotificationSchema.xml | 0 .../openHAB.Core}/Services/SettingsService.cs | 0 .../Services/WidgetNavigationService.cs | 0 .../openHAB.Core}/Strings/de-de/Errors.resw | 0 .../Strings/de-de/Resources.resw | 0 .../openHAB.Core}/Strings/en-us/Errors.resw | 0 .../Strings/en-us/Resources.resw | 0 .../openHAB.Windows}/App.xaml | 0 .../openHAB.Windows}/App.xaml.cs | 0 .../Assets/LockScreenLogo.scale-200.png | Bin .../openHAB.Windows}/Assets/LogoFlat.png | Bin .../openHAB.Windows}/Assets/LogoSplash.jpg | Bin .../Assets/NewStoreLogo.scale-100.png | Bin .../Assets/NewStoreLogo.scale-125.png | Bin .../Assets/NewStoreLogo.scale-150.png | Bin .../Assets/NewStoreLogo.scale-200.png | Bin .../Assets/NewStoreLogo.scale-400.png | Bin .../Assets/SplashScreen.scale-100.png | Bin .../Assets/SplashScreen.scale-125.png | Bin .../Assets/SplashScreen.scale-150.png | Bin .../Assets/SplashScreen.scale-200.png | Bin .../Assets/SplashScreen.scale-400.png | Bin .../Assets/Square150x150Logo.scale-100.png | Bin .../Assets/Square150x150Logo.scale-125.png | Bin .../Assets/Square150x150Logo.scale-150.png | Bin .../Assets/Square150x150Logo.scale-200.png | Bin .../Assets/Square150x150Logo.scale-400.png | Bin .../Assets/Square310x310Logo.scale-100.png | Bin .../Assets/Square310x310Logo.scale-125.png | Bin .../Assets/Square310x310Logo.scale-150.png | Bin .../Assets/Square310x310Logo.scale-200.png | Bin .../Assets/Square310x310Logo.scale-400.png | Bin .../Assets/Square44x44Logo.scale-100.png | Bin .../Assets/Square44x44Logo.scale-125.png | Bin .../Assets/Square44x44Logo.scale-150.png | Bin .../Assets/Square44x44Logo.scale-200.png | Bin .../Assets/Square44x44Logo.scale-400.png | Bin .../Assets/Square44x44Logo.targetsize-16.png | Bin ...x44Logo.targetsize-16_altform-unplated.png | Bin .../Assets/Square44x44Logo.targetsize-24.png | Bin ...x44Logo.targetsize-24_altform-unplated.png | Bin .../Assets/Square44x44Logo.targetsize-256.png | Bin ...44Logo.targetsize-256_altform-unplated.png | Bin .../Assets/Square44x44Logo.targetsize-32.png | Bin ...x44Logo.targetsize-32_altform-unplated.png | Bin .../Assets/Square44x44Logo.targetsize-48.png | Bin ...x44Logo.targetsize-48_altform-unplated.png | Bin .../Assets/Square71x71Logo.scale-100.png | Bin .../Assets/Square71x71Logo.scale-125.png | Bin .../Assets/Square71x71Logo.scale-150.png | Bin .../Assets/Square71x71Logo.scale-200.png | Bin .../Assets/Square71x71Logo.scale-400.png | Bin .../Assets/StoreLogo.backup.png | Bin .../Assets/Wide310x150Logo.scale-100.png | Bin .../Assets/Wide310x150Logo.scale-125.png | Bin .../Assets/Wide310x150Logo.scale-150.png | Bin .../Assets/Wide310x150Logo.scale-200.png | Bin .../Assets/Wide310x150Logo.scale-400.png | Bin .../openHAB.Windows}/Assets/background.jpg | Bin .../Assets/logoTransparantBig.png | Bin .../Assets/openhab-logo-square.png | Bin .../openHAB.Windows}/Assets/openhab.png | Bin .../Controls/ChartWidget.xaml | 0 .../Controls/ChartWidget.xaml.cs | 0 .../openHAB.Windows}/Controls/ColorMap.xaml | 0 .../Controls/ColorMap.xaml.cs | 0 .../Controls/ColorWidget.xaml | 0 .../Controls/ColorWidget.xaml.cs | 0 .../Controls/ConnectionDialog.xaml | 0 .../Controls/ConnectionDialog.xaml.cs | 0 .../Controls/DeviceFamilyStateTrigger.cs | 0 .../Controls/FrameWidget.xaml | 0 .../Controls/FrameWidget.xaml.cs | 0 .../openHAB.Windows}/Controls/ImageLabel.xaml | 0 .../Controls/ImageLabel.xaml.cs | 0 .../Controls/ImageWidget.xaml | 0 .../Controls/ImageWidget.xaml.cs | 0 .../Controls/MapViewWidget.xaml | 0 .../Controls/MapViewWidget.xaml.cs | 0 .../Controls/MjpegWidget.xaml | 0 .../Controls/MjpegWidget.xaml.cs | 0 .../Controls/NavMenuListView.cs | 0 .../Controls/PageLinkWidget.xaml | 0 .../Controls/PageLinkWidget.xaml.cs | 0 .../openHAB.Windows}/Controls/RadialSlider.cs | 0 .../Controls/RollershutterWidget.xaml | 0 .../Controls/RollershutterWidget.xaml.cs | 0 .../Controls/SectionSwitchWidget.xaml | 0 .../Controls/SectionSwitchWidget.xaml.cs | 0 .../Controls/SelectionWidget.xaml | 0 .../Controls/SelectionWidget.xaml.cs | 0 .../Controls/SetpointWidget.xaml | 0 .../Controls/SetpointWidget.xaml.cs | 0 .../Controls/SliderWidget.xaml | 0 .../Controls/SliderWidget.xaml.cs | 0 .../Controls/SwitchWidget.xaml | 0 .../Controls/SwitchWidget.xaml.cs | 0 .../openHAB.Windows}/Controls/TextWidget.xaml | 0 .../Controls/TextWidget.xaml.cs | 0 .../Controls/ToggleWidget.xaml | 0 .../Controls/ToggleWidget.xaml.cs | 0 .../Controls/WebViewWidget.xaml | 0 .../Controls/WebViewWidget.xaml.cs | 0 .../openHAB.Windows}/Controls/WidgetBase.cs | 0 .../BooleanToVisibilityConverter.cs | 0 .../Converters/IconToBitmapConverter.cs | 0 .../Converters/IconToPathConverter.cs | 0 .../Converters/MenuItemTemplateSelector.cs | 0 .../Converters/NullToBooleanConverter.cs | 0 .../Converters/ObjectToSitemapConverter.cs | 0 .../Converters/OpenHabUrlStateToGlyph.cs | 0 .../Converters/ReverseBoolConverter.cs | 0 .../Converters/StateToBoolConverter.cs | 0 .../Converters/StringToColorBrushConverter.cs | 0 .../Converters/StringToDoubleConverter.cs | 0 .../Converters/WidgetTemplateSelector.cs | 0 .../Converters/ZeroToVisibilityConverter.cs | 0 .../openHAB.Windows}/DIService.cs | 0 .../Extensions/ContentDialogExtensions.cs | 0 .../openHAB.Windows}/GlobalSuppressions.cs | 0 .../OpenHAB.Windows_StoreKey.pfx | Bin .../Package.StoreAssociation.xml | 0 .../openHAB.Windows}/Package.appxmanifest | 0 .../Properties/Annotations.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Properties/Default.rd.xml | 0 .../openHAB.Windows}/Styles/DefaultTheme.xaml | 0 .../openHAB.Windows}/Themes/Generic.xaml | 0 .../openHAB.Windows}/View/LogViewerPage.xaml | 0 .../View/LogViewerPage.xaml.cs | 0 .../openHAB.Windows}/View/MainPage.xaml | 0 .../openHAB.Windows}/View/MainPage.xaml.cs | 0 .../openHAB.Windows}/View/SettingsPage.xaml | 0 .../View/SettingsPage.xaml.cs | 0 .../ViewModel/ConfigurationViewModel.cs | 0 .../ViewModel/ConnectionDialogViewModel.cs | 0 .../ViewModel/ConnectionProfileViewModel.cs | 0 .../openHAB.Windows}/ViewModel/IViewModel.cs | 0 .../ViewModel/LanguageViewModel.cs | 0 .../ViewModel/LogsViewModel.cs | 0 .../ViewModel/MainViewModel.cs | 0 .../ViewModel/SettingsViewModel.cs | 0 .../ViewModel/SitemapViewModel.cs | 0 .../ViewModel/ViewModelBase.cs | 0 ....GeneratedMSBuildEditorConfig.editorconfig | 8 ++++ .../openHAB.Windows/openHAB.Windows.csproj | 9 ++-- 222 files changed, 38 insertions(+), 35 deletions(-) rename {Libs => libaries}/MJPEGDecoderWinRTLib.dll (100%) rename {openHAB.Core.Client => src/openHAB.Core.Client}/openHAB.Core.Client.csproj (100%) rename {Openhab.Core => src/openHAB.Core}/AppResources.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/ActionCommand.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/ColorChangedEventArgs.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/ColorHelper.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/Constants.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/DataErrorInfo.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/DeviceFamily.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/DeviceTypeHelper.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/Enum.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/HttpResponseResult.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/ObservableCollectionExtensions.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Common/OpenHABHttpClient.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Contracts/IConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Contracts/Services/IDependencyInjectionService.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Contracts/Services/ISettingsService.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/FireErrorMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/FireInfoMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/ItemStateChangedMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/MessageType.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/SettingsUpdatedMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/SettingsValidationMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/TriggerCommandMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/UpdateItemMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Messages/WidgetClickedMessage.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/CloudConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/DefaultConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/DemoConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/LocalConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/OpenHABConnection.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/OpenHABHttpClientType.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Connection/RemoteConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Event/EventStreamData.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Event/EventStreamPayload.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Event/OpenHABEvent.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Event/OpenHABEventType.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Link.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABAPIInfo.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABCommandDescription.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABCommandOptions.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABCommands.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABConnectionType.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABException.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABItem.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABSitemap.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABUrlState.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABWidget.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABWidgetFactory.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHABWidgetMapping.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenHabVersion.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/OpenhabConnectionProfile.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/RuntimeInfo.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/Settings.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Model/WidgetTypeEnum.cs (100%) rename {Openhab.Core => src/openHAB.Core}/OpenHAB.Core.GeneratedMSBuildEditorConfig.editorconfig (100%) rename {Openhab.Core => src/openHAB.Core}/Openhab.Core.csproj (100%) rename {Openhab.Core => src/openHAB.Core}/Properties/AssemblyInfo.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Properties/OpenHAB.Core.rd.xml (100%) rename {Openhab.Core => src/openHAB.Core}/SDK/IOpenHAB.cs (100%) rename {Openhab.Core => src/openHAB.Core}/SDK/OpenHABClient.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/AppManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/IAppManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/IIconCaching.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/IItemManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/IconCaching.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/ItemManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/INotificationManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/IOpenHABEventParser.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/NotificationManager.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/OpenHABEventParser.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/TileNotificationSchema.xml (100%) rename {Openhab.Core => src/openHAB.Core}/Services/Notification/ToastNotificationSchema.xml (100%) rename {Openhab.Core => src/openHAB.Core}/Services/SettingsService.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Services/WidgetNavigationService.cs (100%) rename {Openhab.Core => src/openHAB.Core}/Strings/de-de/Errors.resw (100%) rename {Openhab.Core => src/openHAB.Core}/Strings/de-de/Resources.resw (100%) rename {Openhab.Core => src/openHAB.Core}/Strings/en-us/Errors.resw (100%) rename {Openhab.Core => src/openHAB.Core}/Strings/en-us/Resources.resw (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/App.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/App.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/LockScreenLogo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/LogoFlat.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/LogoSplash.jpg (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/NewStoreLogo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/NewStoreLogo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/NewStoreLogo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/NewStoreLogo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/NewStoreLogo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/SplashScreen.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/SplashScreen.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/SplashScreen.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/SplashScreen.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/SplashScreen.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square150x150Logo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square150x150Logo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square150x150Logo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square150x150Logo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square150x150Logo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square310x310Logo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square310x310Logo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square310x310Logo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square310x310Logo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square310x310Logo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-16.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-16_altform-unplated.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-24.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-256.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-256_altform-unplated.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-32.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-32_altform-unplated.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-48.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square44x44Logo.targetsize-48_altform-unplated.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square71x71Logo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square71x71Logo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square71x71Logo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square71x71Logo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Square71x71Logo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/StoreLogo.backup.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Wide310x150Logo.scale-100.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Wide310x150Logo.scale-125.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Wide310x150Logo.scale-150.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Wide310x150Logo.scale-200.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/Wide310x150Logo.scale-400.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/background.jpg (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/logoTransparantBig.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/openhab-logo-square.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Assets/openhab.png (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ChartWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ChartWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ColorMap.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ColorMap.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ColorWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ColorWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ConnectionDialog.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ConnectionDialog.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/DeviceFamilyStateTrigger.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/FrameWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/FrameWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ImageLabel.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ImageLabel.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ImageWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ImageWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/MapViewWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/MapViewWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/MjpegWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/MjpegWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/NavMenuListView.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/PageLinkWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/PageLinkWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/RadialSlider.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/RollershutterWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/RollershutterWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SectionSwitchWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SectionSwitchWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SelectionWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SelectionWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SetpointWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SetpointWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SliderWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SliderWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SwitchWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/SwitchWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/TextWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/TextWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ToggleWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/ToggleWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/WebViewWidget.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/WebViewWidget.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Controls/WidgetBase.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/BooleanToVisibilityConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/IconToBitmapConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/IconToPathConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/MenuItemTemplateSelector.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/NullToBooleanConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/ObjectToSitemapConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/OpenHabUrlStateToGlyph.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/ReverseBoolConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/StateToBoolConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/StringToColorBrushConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/StringToDoubleConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/WidgetTemplateSelector.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Converters/ZeroToVisibilityConverter.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/DIService.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Extensions/ContentDialogExtensions.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/GlobalSuppressions.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/OpenHAB.Windows_StoreKey.pfx (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Package.StoreAssociation.xml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Package.appxmanifest (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Properties/Annotations.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Properties/AssemblyInfo.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Properties/Default.rd.xml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Styles/DefaultTheme.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/Themes/Generic.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/LogViewerPage.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/LogViewerPage.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/MainPage.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/MainPage.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/SettingsPage.xaml (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/View/SettingsPage.xaml.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/ConfigurationViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/ConnectionDialogViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/ConnectionProfileViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/IViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/LanguageViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/LogsViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/MainViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/SettingsViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/SitemapViewModel.cs (100%) rename {OpenHAB.Windows => src/openHAB.Windows}/ViewModel/ViewModelBase.cs (100%) create mode 100644 src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig rename OpenHAB.Windows/OpenHAB.Windows.csproj => src/openHAB.Windows/openHAB.Windows.csproj (98%) diff --git a/.github/workflows/actions/app-build/action.yml b/.github/workflows/actions/app-build/action.yml index 5eb60e48..409c3704 100644 --- a/.github/workflows/actions/app-build/action.yml +++ b/.github/workflows/actions/app-build/action.yml @@ -37,13 +37,13 @@ runs: $minor = [System.DateTime]::Now.Month $build = [System.DateTime]::Now.Day - ./Set-Version.ps1 -SourceDirectory '${{github.workspace}}\src\' -Major $major -Minor $minor -Build $build -Revision 0 -SetVersion + ./Set-Version.ps1 -SourceDirectory '${{github.workspace}}\repo\src\' -Major $major -Minor $minor -Build $build -Revision 0 -SetVersion - name: Restore nuget packages shell: pwsh run: | Write-Host "==== Restore Nuget packages ====" -ForegroundColor Green - nuget restore ${{github.workspace}}\src\OpenHAB.Windows.sln + nuget restore ${{github.workspace}}\repo\OpenHAB.Windows.sln - name: Build OpenHab Windows App shell: pwsh @@ -52,4 +52,4 @@ runs: SONAR_TOKEN: ${{inputs.SONAR_TOKEN}} run: | Write-Host "==== Build app package ====" -ForegroundColor Green - msbuild.exe ${{github.workspace}}\src\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs. bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild \ No newline at end of file + msbuild.exe ${{github.workspace}}\repo\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs. bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild \ No newline at end of file diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml index 173f4010..ea244077 100644 --- a/.github/workflows/app-release.yml +++ b/.github/workflows/app-release.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout main code uses: actions/checkout@v2 with: - path: src + path: repo clean: true - name: Setup NuGet.exe for use with actions @@ -40,7 +40,7 @@ jobs: - name: Build App id: create_app_package - uses: ./src/.github/workflows/actions/app-build + uses: ./repo/.github/workflows/actions/app-build with: build_configuration: ${{github.event.inputs.BuildConfiguration}} output_directory: '${{env.BuildDirectory}}' diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fc9c955..d9961c47 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: - name: Checkout main code uses: actions/checkout@v2 with: - path: src + path: repo clean: true - name: Setup NuGet.exe for use with actions @@ -64,11 +64,11 @@ jobs: SONAR_TOKEN: ${{secrets.SONAR_TOKE }} shell: pwsh run: | - .\.sonar\scanner\SonarScanner.MSBuild.exe begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.verbose="true" + .\.sonar\scanner\SonarScanner.MSBuild.exe begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.projectBaseDir="${{github.workspace}}/repo/src/" /d:sonar.verbose="true" - name: Build App id: create_app_package - uses: .\src\.github\workflows\actions\app-build + uses: .\repo\.github\workflows\actions\app-build with: build_configuration: 'debug' output_directory: '${{env.BuildDirectory}}' diff --git a/OpenHAB.Windows.sln b/OpenHAB.Windows.sln index 9cc33817..7824d181 100644 --- a/OpenHAB.Windows.sln +++ b/OpenHAB.Windows.sln @@ -3,33 +3,42 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29409.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Windows", "OpenHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{6D9E45E3-F3C1-4A9D-A62D-72DDBA11C31B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libaries", "libaries", "{6D9E45E3-F3C1-4A9D-A62D-72DDBA11C31B}" ProjectSection(SolutionItems) = preProject Libs\MJPEGDecoderWinRTLib.dll = Libs\MJPEGDecoderWinRTLib.dll EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Core", "OpenHAB.Core\openHAB.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5CFF8A8-CFA1-4C8F-A197-4F095FAC2B76}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Openhab.Core", "src\openHAB.Core\Openhab.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Windows", "src\openHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|Any CPU.ActiveCfg = Debug|x86 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.ActiveCfg = Debug|ARM + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.Build.0 = Debug|ARM + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.ActiveCfg = Debug|x64 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.Build.0 = Debug|x64 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.ActiveCfg = Debug|x86 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.Build.0 = Debug|x86 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.ActiveCfg = Release|ARM + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.Build.0 = Release|ARM + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.ActiveCfg = Release|x64 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.Build.0 = Release|x64 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.ActiveCfg = Release|x86 + {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.Build.0 = Release|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.ActiveCfg = Debug|ARM {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Build.0 = Debug|ARM {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Deploy.0 = Debug|ARM @@ -39,7 +48,6 @@ Global {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.ActiveCfg = Debug|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Build.0 = Debug|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Deploy.0 = Debug|x86 - {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|Any CPU.ActiveCfg = Release|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.ActiveCfg = Release|ARM {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Build.0 = Release|ARM {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Deploy.0 = Release|ARM @@ -49,20 +57,6 @@ Global {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.ActiveCfg = Release|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Build.0 = Release|x86 {D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Deploy.0 = Release|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|Any CPU.ActiveCfg = Debug|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.ActiveCfg = Debug|ARM - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.Build.0 = Debug|ARM - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.ActiveCfg = Debug|x64 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.Build.0 = Debug|x64 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.ActiveCfg = Debug|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.Build.0 = Debug|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|Any CPU.ActiveCfg = Release|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.ActiveCfg = Release|ARM - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.Build.0 = Release|ARM - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.ActiveCfg = Release|x64 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.Build.0 = Release|x64 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.ActiveCfg = Release|x86 - {2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Libs/MJPEGDecoderWinRTLib.dll b/libaries/MJPEGDecoderWinRTLib.dll similarity index 100% rename from Libs/MJPEGDecoderWinRTLib.dll rename to libaries/MJPEGDecoderWinRTLib.dll diff --git a/openHAB.Core.Client/openHAB.Core.Client.csproj b/src/openHAB.Core.Client/openHAB.Core.Client.csproj similarity index 100% rename from openHAB.Core.Client/openHAB.Core.Client.csproj rename to src/openHAB.Core.Client/openHAB.Core.Client.csproj diff --git a/Openhab.Core/AppResources.cs b/src/openHAB.Core/AppResources.cs similarity index 100% rename from Openhab.Core/AppResources.cs rename to src/openHAB.Core/AppResources.cs diff --git a/Openhab.Core/Common/ActionCommand.cs b/src/openHAB.Core/Common/ActionCommand.cs similarity index 100% rename from Openhab.Core/Common/ActionCommand.cs rename to src/openHAB.Core/Common/ActionCommand.cs diff --git a/Openhab.Core/Common/ColorChangedEventArgs.cs b/src/openHAB.Core/Common/ColorChangedEventArgs.cs similarity index 100% rename from Openhab.Core/Common/ColorChangedEventArgs.cs rename to src/openHAB.Core/Common/ColorChangedEventArgs.cs diff --git a/Openhab.Core/Common/ColorHelper.cs b/src/openHAB.Core/Common/ColorHelper.cs similarity index 100% rename from Openhab.Core/Common/ColorHelper.cs rename to src/openHAB.Core/Common/ColorHelper.cs diff --git a/Openhab.Core/Common/Constants.cs b/src/openHAB.Core/Common/Constants.cs similarity index 100% rename from Openhab.Core/Common/Constants.cs rename to src/openHAB.Core/Common/Constants.cs diff --git a/Openhab.Core/Common/DataErrorInfo.cs b/src/openHAB.Core/Common/DataErrorInfo.cs similarity index 100% rename from Openhab.Core/Common/DataErrorInfo.cs rename to src/openHAB.Core/Common/DataErrorInfo.cs diff --git a/Openhab.Core/Common/DeviceFamily.cs b/src/openHAB.Core/Common/DeviceFamily.cs similarity index 100% rename from Openhab.Core/Common/DeviceFamily.cs rename to src/openHAB.Core/Common/DeviceFamily.cs diff --git a/Openhab.Core/Common/DeviceTypeHelper.cs b/src/openHAB.Core/Common/DeviceTypeHelper.cs similarity index 100% rename from Openhab.Core/Common/DeviceTypeHelper.cs rename to src/openHAB.Core/Common/DeviceTypeHelper.cs diff --git a/Openhab.Core/Common/Enum.cs b/src/openHAB.Core/Common/Enum.cs similarity index 100% rename from Openhab.Core/Common/Enum.cs rename to src/openHAB.Core/Common/Enum.cs diff --git a/Openhab.Core/Common/HttpResponseResult.cs b/src/openHAB.Core/Common/HttpResponseResult.cs similarity index 100% rename from Openhab.Core/Common/HttpResponseResult.cs rename to src/openHAB.Core/Common/HttpResponseResult.cs diff --git a/Openhab.Core/Common/ObservableCollectionExtensions.cs b/src/openHAB.Core/Common/ObservableCollectionExtensions.cs similarity index 100% rename from Openhab.Core/Common/ObservableCollectionExtensions.cs rename to src/openHAB.Core/Common/ObservableCollectionExtensions.cs diff --git a/Openhab.Core/Common/OpenHABHttpClient.cs b/src/openHAB.Core/Common/OpenHABHttpClient.cs similarity index 100% rename from Openhab.Core/Common/OpenHABHttpClient.cs rename to src/openHAB.Core/Common/OpenHABHttpClient.cs diff --git a/Openhab.Core/Contracts/IConnectionProfile.cs b/src/openHAB.Core/Contracts/IConnectionProfile.cs similarity index 100% rename from Openhab.Core/Contracts/IConnectionProfile.cs rename to src/openHAB.Core/Contracts/IConnectionProfile.cs diff --git a/Openhab.Core/Contracts/Services/IDependencyInjectionService.cs b/src/openHAB.Core/Contracts/Services/IDependencyInjectionService.cs similarity index 100% rename from Openhab.Core/Contracts/Services/IDependencyInjectionService.cs rename to src/openHAB.Core/Contracts/Services/IDependencyInjectionService.cs diff --git a/Openhab.Core/Contracts/Services/ISettingsService.cs b/src/openHAB.Core/Contracts/Services/ISettingsService.cs similarity index 100% rename from Openhab.Core/Contracts/Services/ISettingsService.cs rename to src/openHAB.Core/Contracts/Services/ISettingsService.cs diff --git a/Openhab.Core/Messages/FireErrorMessage.cs b/src/openHAB.Core/Messages/FireErrorMessage.cs similarity index 100% rename from Openhab.Core/Messages/FireErrorMessage.cs rename to src/openHAB.Core/Messages/FireErrorMessage.cs diff --git a/Openhab.Core/Messages/FireInfoMessage.cs b/src/openHAB.Core/Messages/FireInfoMessage.cs similarity index 100% rename from Openhab.Core/Messages/FireInfoMessage.cs rename to src/openHAB.Core/Messages/FireInfoMessage.cs diff --git a/Openhab.Core/Messages/ItemStateChangedMessage.cs b/src/openHAB.Core/Messages/ItemStateChangedMessage.cs similarity index 100% rename from Openhab.Core/Messages/ItemStateChangedMessage.cs rename to src/openHAB.Core/Messages/ItemStateChangedMessage.cs diff --git a/Openhab.Core/Messages/MessageType.cs b/src/openHAB.Core/Messages/MessageType.cs similarity index 100% rename from Openhab.Core/Messages/MessageType.cs rename to src/openHAB.Core/Messages/MessageType.cs diff --git a/Openhab.Core/Messages/SettingsUpdatedMessage.cs b/src/openHAB.Core/Messages/SettingsUpdatedMessage.cs similarity index 100% rename from Openhab.Core/Messages/SettingsUpdatedMessage.cs rename to src/openHAB.Core/Messages/SettingsUpdatedMessage.cs diff --git a/Openhab.Core/Messages/SettingsValidationMessage.cs b/src/openHAB.Core/Messages/SettingsValidationMessage.cs similarity index 100% rename from Openhab.Core/Messages/SettingsValidationMessage.cs rename to src/openHAB.Core/Messages/SettingsValidationMessage.cs diff --git a/Openhab.Core/Messages/TriggerCommandMessage.cs b/src/openHAB.Core/Messages/TriggerCommandMessage.cs similarity index 100% rename from Openhab.Core/Messages/TriggerCommandMessage.cs rename to src/openHAB.Core/Messages/TriggerCommandMessage.cs diff --git a/Openhab.Core/Messages/UpdateItemMessage.cs b/src/openHAB.Core/Messages/UpdateItemMessage.cs similarity index 100% rename from Openhab.Core/Messages/UpdateItemMessage.cs rename to src/openHAB.Core/Messages/UpdateItemMessage.cs diff --git a/Openhab.Core/Messages/WidgetClickedMessage.cs b/src/openHAB.Core/Messages/WidgetClickedMessage.cs similarity index 100% rename from Openhab.Core/Messages/WidgetClickedMessage.cs rename to src/openHAB.Core/Messages/WidgetClickedMessage.cs diff --git a/Openhab.Core/Model/Connection/CloudConnectionProfile.cs b/src/openHAB.Core/Model/Connection/CloudConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/Connection/CloudConnectionProfile.cs rename to src/openHAB.Core/Model/Connection/CloudConnectionProfile.cs diff --git a/Openhab.Core/Model/Connection/DefaultConnectionProfile.cs b/src/openHAB.Core/Model/Connection/DefaultConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/Connection/DefaultConnectionProfile.cs rename to src/openHAB.Core/Model/Connection/DefaultConnectionProfile.cs diff --git a/Openhab.Core/Model/Connection/DemoConnectionProfile.cs b/src/openHAB.Core/Model/Connection/DemoConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/Connection/DemoConnectionProfile.cs rename to src/openHAB.Core/Model/Connection/DemoConnectionProfile.cs diff --git a/Openhab.Core/Model/Connection/LocalConnectionProfile.cs b/src/openHAB.Core/Model/Connection/LocalConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/Connection/LocalConnectionProfile.cs rename to src/openHAB.Core/Model/Connection/LocalConnectionProfile.cs diff --git a/Openhab.Core/Model/Connection/OpenHABConnection.cs b/src/openHAB.Core/Model/Connection/OpenHABConnection.cs similarity index 100% rename from Openhab.Core/Model/Connection/OpenHABConnection.cs rename to src/openHAB.Core/Model/Connection/OpenHABConnection.cs diff --git a/Openhab.Core/Model/Connection/OpenHABHttpClientType.cs b/src/openHAB.Core/Model/Connection/OpenHABHttpClientType.cs similarity index 100% rename from Openhab.Core/Model/Connection/OpenHABHttpClientType.cs rename to src/openHAB.Core/Model/Connection/OpenHABHttpClientType.cs diff --git a/Openhab.Core/Model/Connection/RemoteConnectionProfile.cs b/src/openHAB.Core/Model/Connection/RemoteConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/Connection/RemoteConnectionProfile.cs rename to src/openHAB.Core/Model/Connection/RemoteConnectionProfile.cs diff --git a/Openhab.Core/Model/Event/EventStreamData.cs b/src/openHAB.Core/Model/Event/EventStreamData.cs similarity index 100% rename from Openhab.Core/Model/Event/EventStreamData.cs rename to src/openHAB.Core/Model/Event/EventStreamData.cs diff --git a/Openhab.Core/Model/Event/EventStreamPayload.cs b/src/openHAB.Core/Model/Event/EventStreamPayload.cs similarity index 100% rename from Openhab.Core/Model/Event/EventStreamPayload.cs rename to src/openHAB.Core/Model/Event/EventStreamPayload.cs diff --git a/Openhab.Core/Model/Event/OpenHABEvent.cs b/src/openHAB.Core/Model/Event/OpenHABEvent.cs similarity index 100% rename from Openhab.Core/Model/Event/OpenHABEvent.cs rename to src/openHAB.Core/Model/Event/OpenHABEvent.cs diff --git a/Openhab.Core/Model/Event/OpenHABEventType.cs b/src/openHAB.Core/Model/Event/OpenHABEventType.cs similarity index 100% rename from Openhab.Core/Model/Event/OpenHABEventType.cs rename to src/openHAB.Core/Model/Event/OpenHABEventType.cs diff --git a/Openhab.Core/Model/Link.cs b/src/openHAB.Core/Model/Link.cs similarity index 100% rename from Openhab.Core/Model/Link.cs rename to src/openHAB.Core/Model/Link.cs diff --git a/Openhab.Core/Model/OpenHABAPIInfo.cs b/src/openHAB.Core/Model/OpenHABAPIInfo.cs similarity index 100% rename from Openhab.Core/Model/OpenHABAPIInfo.cs rename to src/openHAB.Core/Model/OpenHABAPIInfo.cs diff --git a/Openhab.Core/Model/OpenHABCommandDescription.cs b/src/openHAB.Core/Model/OpenHABCommandDescription.cs similarity index 100% rename from Openhab.Core/Model/OpenHABCommandDescription.cs rename to src/openHAB.Core/Model/OpenHABCommandDescription.cs diff --git a/Openhab.Core/Model/OpenHABCommandOptions.cs b/src/openHAB.Core/Model/OpenHABCommandOptions.cs similarity index 100% rename from Openhab.Core/Model/OpenHABCommandOptions.cs rename to src/openHAB.Core/Model/OpenHABCommandOptions.cs diff --git a/Openhab.Core/Model/OpenHABCommands.cs b/src/openHAB.Core/Model/OpenHABCommands.cs similarity index 100% rename from Openhab.Core/Model/OpenHABCommands.cs rename to src/openHAB.Core/Model/OpenHABCommands.cs diff --git a/Openhab.Core/Model/OpenHABConnectionType.cs b/src/openHAB.Core/Model/OpenHABConnectionType.cs similarity index 100% rename from Openhab.Core/Model/OpenHABConnectionType.cs rename to src/openHAB.Core/Model/OpenHABConnectionType.cs diff --git a/Openhab.Core/Model/OpenHABException.cs b/src/openHAB.Core/Model/OpenHABException.cs similarity index 100% rename from Openhab.Core/Model/OpenHABException.cs rename to src/openHAB.Core/Model/OpenHABException.cs diff --git a/Openhab.Core/Model/OpenHABItem.cs b/src/openHAB.Core/Model/OpenHABItem.cs similarity index 100% rename from Openhab.Core/Model/OpenHABItem.cs rename to src/openHAB.Core/Model/OpenHABItem.cs diff --git a/Openhab.Core/Model/OpenHABSitemap.cs b/src/openHAB.Core/Model/OpenHABSitemap.cs similarity index 100% rename from Openhab.Core/Model/OpenHABSitemap.cs rename to src/openHAB.Core/Model/OpenHABSitemap.cs diff --git a/Openhab.Core/Model/OpenHABUrlState.cs b/src/openHAB.Core/Model/OpenHABUrlState.cs similarity index 100% rename from Openhab.Core/Model/OpenHABUrlState.cs rename to src/openHAB.Core/Model/OpenHABUrlState.cs diff --git a/Openhab.Core/Model/OpenHABWidget.cs b/src/openHAB.Core/Model/OpenHABWidget.cs similarity index 100% rename from Openhab.Core/Model/OpenHABWidget.cs rename to src/openHAB.Core/Model/OpenHABWidget.cs diff --git a/Openhab.Core/Model/OpenHABWidgetFactory.cs b/src/openHAB.Core/Model/OpenHABWidgetFactory.cs similarity index 100% rename from Openhab.Core/Model/OpenHABWidgetFactory.cs rename to src/openHAB.Core/Model/OpenHABWidgetFactory.cs diff --git a/Openhab.Core/Model/OpenHABWidgetMapping.cs b/src/openHAB.Core/Model/OpenHABWidgetMapping.cs similarity index 100% rename from Openhab.Core/Model/OpenHABWidgetMapping.cs rename to src/openHAB.Core/Model/OpenHABWidgetMapping.cs diff --git a/Openhab.Core/Model/OpenHabVersion.cs b/src/openHAB.Core/Model/OpenHabVersion.cs similarity index 100% rename from Openhab.Core/Model/OpenHabVersion.cs rename to src/openHAB.Core/Model/OpenHabVersion.cs diff --git a/Openhab.Core/Model/OpenhabConnectionProfile.cs b/src/openHAB.Core/Model/OpenhabConnectionProfile.cs similarity index 100% rename from Openhab.Core/Model/OpenhabConnectionProfile.cs rename to src/openHAB.Core/Model/OpenhabConnectionProfile.cs diff --git a/Openhab.Core/Model/RuntimeInfo.cs b/src/openHAB.Core/Model/RuntimeInfo.cs similarity index 100% rename from Openhab.Core/Model/RuntimeInfo.cs rename to src/openHAB.Core/Model/RuntimeInfo.cs diff --git a/Openhab.Core/Model/Settings.cs b/src/openHAB.Core/Model/Settings.cs similarity index 100% rename from Openhab.Core/Model/Settings.cs rename to src/openHAB.Core/Model/Settings.cs diff --git a/Openhab.Core/Model/WidgetTypeEnum.cs b/src/openHAB.Core/Model/WidgetTypeEnum.cs similarity index 100% rename from Openhab.Core/Model/WidgetTypeEnum.cs rename to src/openHAB.Core/Model/WidgetTypeEnum.cs diff --git a/Openhab.Core/OpenHAB.Core.GeneratedMSBuildEditorConfig.editorconfig b/src/openHAB.Core/OpenHAB.Core.GeneratedMSBuildEditorConfig.editorconfig similarity index 100% rename from Openhab.Core/OpenHAB.Core.GeneratedMSBuildEditorConfig.editorconfig rename to src/openHAB.Core/OpenHAB.Core.GeneratedMSBuildEditorConfig.editorconfig diff --git a/Openhab.Core/Openhab.Core.csproj b/src/openHAB.Core/Openhab.Core.csproj similarity index 100% rename from Openhab.Core/Openhab.Core.csproj rename to src/openHAB.Core/Openhab.Core.csproj diff --git a/Openhab.Core/Properties/AssemblyInfo.cs b/src/openHAB.Core/Properties/AssemblyInfo.cs similarity index 100% rename from Openhab.Core/Properties/AssemblyInfo.cs rename to src/openHAB.Core/Properties/AssemblyInfo.cs diff --git a/Openhab.Core/Properties/OpenHAB.Core.rd.xml b/src/openHAB.Core/Properties/OpenHAB.Core.rd.xml similarity index 100% rename from Openhab.Core/Properties/OpenHAB.Core.rd.xml rename to src/openHAB.Core/Properties/OpenHAB.Core.rd.xml diff --git a/Openhab.Core/SDK/IOpenHAB.cs b/src/openHAB.Core/SDK/IOpenHAB.cs similarity index 100% rename from Openhab.Core/SDK/IOpenHAB.cs rename to src/openHAB.Core/SDK/IOpenHAB.cs diff --git a/Openhab.Core/SDK/OpenHABClient.cs b/src/openHAB.Core/SDK/OpenHABClient.cs similarity index 100% rename from Openhab.Core/SDK/OpenHABClient.cs rename to src/openHAB.Core/SDK/OpenHABClient.cs diff --git a/Openhab.Core/Services/AppManager.cs b/src/openHAB.Core/Services/AppManager.cs similarity index 100% rename from Openhab.Core/Services/AppManager.cs rename to src/openHAB.Core/Services/AppManager.cs diff --git a/Openhab.Core/Services/IAppManager.cs b/src/openHAB.Core/Services/IAppManager.cs similarity index 100% rename from Openhab.Core/Services/IAppManager.cs rename to src/openHAB.Core/Services/IAppManager.cs diff --git a/Openhab.Core/Services/IIconCaching.cs b/src/openHAB.Core/Services/IIconCaching.cs similarity index 100% rename from Openhab.Core/Services/IIconCaching.cs rename to src/openHAB.Core/Services/IIconCaching.cs diff --git a/Openhab.Core/Services/IItemManager.cs b/src/openHAB.Core/Services/IItemManager.cs similarity index 100% rename from Openhab.Core/Services/IItemManager.cs rename to src/openHAB.Core/Services/IItemManager.cs diff --git a/Openhab.Core/Services/IconCaching.cs b/src/openHAB.Core/Services/IconCaching.cs similarity index 100% rename from Openhab.Core/Services/IconCaching.cs rename to src/openHAB.Core/Services/IconCaching.cs diff --git a/Openhab.Core/Services/ItemManager.cs b/src/openHAB.Core/Services/ItemManager.cs similarity index 100% rename from Openhab.Core/Services/ItemManager.cs rename to src/openHAB.Core/Services/ItemManager.cs diff --git a/Openhab.Core/Services/Notification/INotificationManager.cs b/src/openHAB.Core/Services/Notification/INotificationManager.cs similarity index 100% rename from Openhab.Core/Services/Notification/INotificationManager.cs rename to src/openHAB.Core/Services/Notification/INotificationManager.cs diff --git a/Openhab.Core/Services/Notification/IOpenHABEventParser.cs b/src/openHAB.Core/Services/Notification/IOpenHABEventParser.cs similarity index 100% rename from Openhab.Core/Services/Notification/IOpenHABEventParser.cs rename to src/openHAB.Core/Services/Notification/IOpenHABEventParser.cs diff --git a/Openhab.Core/Services/Notification/NotificationManager.cs b/src/openHAB.Core/Services/Notification/NotificationManager.cs similarity index 100% rename from Openhab.Core/Services/Notification/NotificationManager.cs rename to src/openHAB.Core/Services/Notification/NotificationManager.cs diff --git a/Openhab.Core/Services/Notification/OpenHABEventParser.cs b/src/openHAB.Core/Services/Notification/OpenHABEventParser.cs similarity index 100% rename from Openhab.Core/Services/Notification/OpenHABEventParser.cs rename to src/openHAB.Core/Services/Notification/OpenHABEventParser.cs diff --git a/Openhab.Core/Services/Notification/TileNotificationSchema.xml b/src/openHAB.Core/Services/Notification/TileNotificationSchema.xml similarity index 100% rename from Openhab.Core/Services/Notification/TileNotificationSchema.xml rename to src/openHAB.Core/Services/Notification/TileNotificationSchema.xml diff --git a/Openhab.Core/Services/Notification/ToastNotificationSchema.xml b/src/openHAB.Core/Services/Notification/ToastNotificationSchema.xml similarity index 100% rename from Openhab.Core/Services/Notification/ToastNotificationSchema.xml rename to src/openHAB.Core/Services/Notification/ToastNotificationSchema.xml diff --git a/Openhab.Core/Services/SettingsService.cs b/src/openHAB.Core/Services/SettingsService.cs similarity index 100% rename from Openhab.Core/Services/SettingsService.cs rename to src/openHAB.Core/Services/SettingsService.cs diff --git a/Openhab.Core/Services/WidgetNavigationService.cs b/src/openHAB.Core/Services/WidgetNavigationService.cs similarity index 100% rename from Openhab.Core/Services/WidgetNavigationService.cs rename to src/openHAB.Core/Services/WidgetNavigationService.cs diff --git a/Openhab.Core/Strings/de-de/Errors.resw b/src/openHAB.Core/Strings/de-de/Errors.resw similarity index 100% rename from Openhab.Core/Strings/de-de/Errors.resw rename to src/openHAB.Core/Strings/de-de/Errors.resw diff --git a/Openhab.Core/Strings/de-de/Resources.resw b/src/openHAB.Core/Strings/de-de/Resources.resw similarity index 100% rename from Openhab.Core/Strings/de-de/Resources.resw rename to src/openHAB.Core/Strings/de-de/Resources.resw diff --git a/Openhab.Core/Strings/en-us/Errors.resw b/src/openHAB.Core/Strings/en-us/Errors.resw similarity index 100% rename from Openhab.Core/Strings/en-us/Errors.resw rename to src/openHAB.Core/Strings/en-us/Errors.resw diff --git a/Openhab.Core/Strings/en-us/Resources.resw b/src/openHAB.Core/Strings/en-us/Resources.resw similarity index 100% rename from Openhab.Core/Strings/en-us/Resources.resw rename to src/openHAB.Core/Strings/en-us/Resources.resw diff --git a/OpenHAB.Windows/App.xaml b/src/openHAB.Windows/App.xaml similarity index 100% rename from OpenHAB.Windows/App.xaml rename to src/openHAB.Windows/App.xaml diff --git a/OpenHAB.Windows/App.xaml.cs b/src/openHAB.Windows/App.xaml.cs similarity index 100% rename from OpenHAB.Windows/App.xaml.cs rename to src/openHAB.Windows/App.xaml.cs diff --git a/OpenHAB.Windows/Assets/LockScreenLogo.scale-200.png b/src/openHAB.Windows/Assets/LockScreenLogo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/LockScreenLogo.scale-200.png rename to src/openHAB.Windows/Assets/LockScreenLogo.scale-200.png diff --git a/OpenHAB.Windows/Assets/LogoFlat.png b/src/openHAB.Windows/Assets/LogoFlat.png similarity index 100% rename from OpenHAB.Windows/Assets/LogoFlat.png rename to src/openHAB.Windows/Assets/LogoFlat.png diff --git a/OpenHAB.Windows/Assets/LogoSplash.jpg b/src/openHAB.Windows/Assets/LogoSplash.jpg similarity index 100% rename from OpenHAB.Windows/Assets/LogoSplash.jpg rename to src/openHAB.Windows/Assets/LogoSplash.jpg diff --git a/OpenHAB.Windows/Assets/NewStoreLogo.scale-100.png b/src/openHAB.Windows/Assets/NewStoreLogo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/NewStoreLogo.scale-100.png rename to src/openHAB.Windows/Assets/NewStoreLogo.scale-100.png diff --git a/OpenHAB.Windows/Assets/NewStoreLogo.scale-125.png b/src/openHAB.Windows/Assets/NewStoreLogo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/NewStoreLogo.scale-125.png rename to src/openHAB.Windows/Assets/NewStoreLogo.scale-125.png diff --git a/OpenHAB.Windows/Assets/NewStoreLogo.scale-150.png b/src/openHAB.Windows/Assets/NewStoreLogo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/NewStoreLogo.scale-150.png rename to src/openHAB.Windows/Assets/NewStoreLogo.scale-150.png diff --git a/OpenHAB.Windows/Assets/NewStoreLogo.scale-200.png b/src/openHAB.Windows/Assets/NewStoreLogo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/NewStoreLogo.scale-200.png rename to src/openHAB.Windows/Assets/NewStoreLogo.scale-200.png diff --git a/OpenHAB.Windows/Assets/NewStoreLogo.scale-400.png b/src/openHAB.Windows/Assets/NewStoreLogo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/NewStoreLogo.scale-400.png rename to src/openHAB.Windows/Assets/NewStoreLogo.scale-400.png diff --git a/OpenHAB.Windows/Assets/SplashScreen.scale-100.png b/src/openHAB.Windows/Assets/SplashScreen.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/SplashScreen.scale-100.png rename to src/openHAB.Windows/Assets/SplashScreen.scale-100.png diff --git a/OpenHAB.Windows/Assets/SplashScreen.scale-125.png b/src/openHAB.Windows/Assets/SplashScreen.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/SplashScreen.scale-125.png rename to src/openHAB.Windows/Assets/SplashScreen.scale-125.png diff --git a/OpenHAB.Windows/Assets/SplashScreen.scale-150.png b/src/openHAB.Windows/Assets/SplashScreen.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/SplashScreen.scale-150.png rename to src/openHAB.Windows/Assets/SplashScreen.scale-150.png diff --git a/OpenHAB.Windows/Assets/SplashScreen.scale-200.png b/src/openHAB.Windows/Assets/SplashScreen.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/SplashScreen.scale-200.png rename to src/openHAB.Windows/Assets/SplashScreen.scale-200.png diff --git a/OpenHAB.Windows/Assets/SplashScreen.scale-400.png b/src/openHAB.Windows/Assets/SplashScreen.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/SplashScreen.scale-400.png rename to src/openHAB.Windows/Assets/SplashScreen.scale-400.png diff --git a/OpenHAB.Windows/Assets/Square150x150Logo.scale-100.png b/src/openHAB.Windows/Assets/Square150x150Logo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/Square150x150Logo.scale-100.png rename to src/openHAB.Windows/Assets/Square150x150Logo.scale-100.png diff --git a/OpenHAB.Windows/Assets/Square150x150Logo.scale-125.png b/src/openHAB.Windows/Assets/Square150x150Logo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/Square150x150Logo.scale-125.png rename to src/openHAB.Windows/Assets/Square150x150Logo.scale-125.png diff --git a/OpenHAB.Windows/Assets/Square150x150Logo.scale-150.png b/src/openHAB.Windows/Assets/Square150x150Logo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/Square150x150Logo.scale-150.png rename to src/openHAB.Windows/Assets/Square150x150Logo.scale-150.png diff --git a/OpenHAB.Windows/Assets/Square150x150Logo.scale-200.png b/src/openHAB.Windows/Assets/Square150x150Logo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/Square150x150Logo.scale-200.png rename to src/openHAB.Windows/Assets/Square150x150Logo.scale-200.png diff --git a/OpenHAB.Windows/Assets/Square150x150Logo.scale-400.png b/src/openHAB.Windows/Assets/Square150x150Logo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/Square150x150Logo.scale-400.png rename to src/openHAB.Windows/Assets/Square150x150Logo.scale-400.png diff --git a/OpenHAB.Windows/Assets/Square310x310Logo.scale-100.png b/src/openHAB.Windows/Assets/Square310x310Logo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/Square310x310Logo.scale-100.png rename to src/openHAB.Windows/Assets/Square310x310Logo.scale-100.png diff --git a/OpenHAB.Windows/Assets/Square310x310Logo.scale-125.png b/src/openHAB.Windows/Assets/Square310x310Logo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/Square310x310Logo.scale-125.png rename to src/openHAB.Windows/Assets/Square310x310Logo.scale-125.png diff --git a/OpenHAB.Windows/Assets/Square310x310Logo.scale-150.png b/src/openHAB.Windows/Assets/Square310x310Logo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/Square310x310Logo.scale-150.png rename to src/openHAB.Windows/Assets/Square310x310Logo.scale-150.png diff --git a/OpenHAB.Windows/Assets/Square310x310Logo.scale-200.png b/src/openHAB.Windows/Assets/Square310x310Logo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/Square310x310Logo.scale-200.png rename to src/openHAB.Windows/Assets/Square310x310Logo.scale-200.png diff --git a/OpenHAB.Windows/Assets/Square310x310Logo.scale-400.png b/src/openHAB.Windows/Assets/Square310x310Logo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/Square310x310Logo.scale-400.png rename to src/openHAB.Windows/Assets/Square310x310Logo.scale-400.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.scale-100.png b/src/openHAB.Windows/Assets/Square44x44Logo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.scale-100.png rename to src/openHAB.Windows/Assets/Square44x44Logo.scale-100.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.scale-125.png b/src/openHAB.Windows/Assets/Square44x44Logo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.scale-125.png rename to src/openHAB.Windows/Assets/Square44x44Logo.scale-125.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.scale-150.png b/src/openHAB.Windows/Assets/Square44x44Logo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.scale-150.png rename to src/openHAB.Windows/Assets/Square44x44Logo.scale-150.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.scale-200.png b/src/openHAB.Windows/Assets/Square44x44Logo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.scale-200.png rename to src/openHAB.Windows/Assets/Square44x44Logo.scale-200.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.scale-400.png b/src/openHAB.Windows/Assets/Square44x44Logo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.scale-400.png rename to src/openHAB.Windows/Assets/Square44x44Logo.scale-400.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-16.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-16.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-24.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-24.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-256.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-256.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-32.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-32.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-48.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-48.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48.png diff --git a/OpenHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png b/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png similarity index 100% rename from OpenHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png rename to src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png diff --git a/OpenHAB.Windows/Assets/Square71x71Logo.scale-100.png b/src/openHAB.Windows/Assets/Square71x71Logo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/Square71x71Logo.scale-100.png rename to src/openHAB.Windows/Assets/Square71x71Logo.scale-100.png diff --git a/OpenHAB.Windows/Assets/Square71x71Logo.scale-125.png b/src/openHAB.Windows/Assets/Square71x71Logo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/Square71x71Logo.scale-125.png rename to src/openHAB.Windows/Assets/Square71x71Logo.scale-125.png diff --git a/OpenHAB.Windows/Assets/Square71x71Logo.scale-150.png b/src/openHAB.Windows/Assets/Square71x71Logo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/Square71x71Logo.scale-150.png rename to src/openHAB.Windows/Assets/Square71x71Logo.scale-150.png diff --git a/OpenHAB.Windows/Assets/Square71x71Logo.scale-200.png b/src/openHAB.Windows/Assets/Square71x71Logo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/Square71x71Logo.scale-200.png rename to src/openHAB.Windows/Assets/Square71x71Logo.scale-200.png diff --git a/OpenHAB.Windows/Assets/Square71x71Logo.scale-400.png b/src/openHAB.Windows/Assets/Square71x71Logo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/Square71x71Logo.scale-400.png rename to src/openHAB.Windows/Assets/Square71x71Logo.scale-400.png diff --git a/OpenHAB.Windows/Assets/StoreLogo.backup.png b/src/openHAB.Windows/Assets/StoreLogo.backup.png similarity index 100% rename from OpenHAB.Windows/Assets/StoreLogo.backup.png rename to src/openHAB.Windows/Assets/StoreLogo.backup.png diff --git a/OpenHAB.Windows/Assets/Wide310x150Logo.scale-100.png b/src/openHAB.Windows/Assets/Wide310x150Logo.scale-100.png similarity index 100% rename from OpenHAB.Windows/Assets/Wide310x150Logo.scale-100.png rename to src/openHAB.Windows/Assets/Wide310x150Logo.scale-100.png diff --git a/OpenHAB.Windows/Assets/Wide310x150Logo.scale-125.png b/src/openHAB.Windows/Assets/Wide310x150Logo.scale-125.png similarity index 100% rename from OpenHAB.Windows/Assets/Wide310x150Logo.scale-125.png rename to src/openHAB.Windows/Assets/Wide310x150Logo.scale-125.png diff --git a/OpenHAB.Windows/Assets/Wide310x150Logo.scale-150.png b/src/openHAB.Windows/Assets/Wide310x150Logo.scale-150.png similarity index 100% rename from OpenHAB.Windows/Assets/Wide310x150Logo.scale-150.png rename to src/openHAB.Windows/Assets/Wide310x150Logo.scale-150.png diff --git a/OpenHAB.Windows/Assets/Wide310x150Logo.scale-200.png b/src/openHAB.Windows/Assets/Wide310x150Logo.scale-200.png similarity index 100% rename from OpenHAB.Windows/Assets/Wide310x150Logo.scale-200.png rename to src/openHAB.Windows/Assets/Wide310x150Logo.scale-200.png diff --git a/OpenHAB.Windows/Assets/Wide310x150Logo.scale-400.png b/src/openHAB.Windows/Assets/Wide310x150Logo.scale-400.png similarity index 100% rename from OpenHAB.Windows/Assets/Wide310x150Logo.scale-400.png rename to src/openHAB.Windows/Assets/Wide310x150Logo.scale-400.png diff --git a/OpenHAB.Windows/Assets/background.jpg b/src/openHAB.Windows/Assets/background.jpg similarity index 100% rename from OpenHAB.Windows/Assets/background.jpg rename to src/openHAB.Windows/Assets/background.jpg diff --git a/OpenHAB.Windows/Assets/logoTransparantBig.png b/src/openHAB.Windows/Assets/logoTransparantBig.png similarity index 100% rename from OpenHAB.Windows/Assets/logoTransparantBig.png rename to src/openHAB.Windows/Assets/logoTransparantBig.png diff --git a/OpenHAB.Windows/Assets/openhab-logo-square.png b/src/openHAB.Windows/Assets/openhab-logo-square.png similarity index 100% rename from OpenHAB.Windows/Assets/openhab-logo-square.png rename to src/openHAB.Windows/Assets/openhab-logo-square.png diff --git a/OpenHAB.Windows/Assets/openhab.png b/src/openHAB.Windows/Assets/openhab.png similarity index 100% rename from OpenHAB.Windows/Assets/openhab.png rename to src/openHAB.Windows/Assets/openhab.png diff --git a/OpenHAB.Windows/Controls/ChartWidget.xaml b/src/openHAB.Windows/Controls/ChartWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ChartWidget.xaml rename to src/openHAB.Windows/Controls/ChartWidget.xaml diff --git a/OpenHAB.Windows/Controls/ChartWidget.xaml.cs b/src/openHAB.Windows/Controls/ChartWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ChartWidget.xaml.cs rename to src/openHAB.Windows/Controls/ChartWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/ColorMap.xaml b/src/openHAB.Windows/Controls/ColorMap.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ColorMap.xaml rename to src/openHAB.Windows/Controls/ColorMap.xaml diff --git a/OpenHAB.Windows/Controls/ColorMap.xaml.cs b/src/openHAB.Windows/Controls/ColorMap.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ColorMap.xaml.cs rename to src/openHAB.Windows/Controls/ColorMap.xaml.cs diff --git a/OpenHAB.Windows/Controls/ColorWidget.xaml b/src/openHAB.Windows/Controls/ColorWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ColorWidget.xaml rename to src/openHAB.Windows/Controls/ColorWidget.xaml diff --git a/OpenHAB.Windows/Controls/ColorWidget.xaml.cs b/src/openHAB.Windows/Controls/ColorWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ColorWidget.xaml.cs rename to src/openHAB.Windows/Controls/ColorWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/ConnectionDialog.xaml b/src/openHAB.Windows/Controls/ConnectionDialog.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ConnectionDialog.xaml rename to src/openHAB.Windows/Controls/ConnectionDialog.xaml diff --git a/OpenHAB.Windows/Controls/ConnectionDialog.xaml.cs b/src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ConnectionDialog.xaml.cs rename to src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs diff --git a/OpenHAB.Windows/Controls/DeviceFamilyStateTrigger.cs b/src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs similarity index 100% rename from OpenHAB.Windows/Controls/DeviceFamilyStateTrigger.cs rename to src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs diff --git a/OpenHAB.Windows/Controls/FrameWidget.xaml b/src/openHAB.Windows/Controls/FrameWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/FrameWidget.xaml rename to src/openHAB.Windows/Controls/FrameWidget.xaml diff --git a/OpenHAB.Windows/Controls/FrameWidget.xaml.cs b/src/openHAB.Windows/Controls/FrameWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/FrameWidget.xaml.cs rename to src/openHAB.Windows/Controls/FrameWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/ImageLabel.xaml b/src/openHAB.Windows/Controls/ImageLabel.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ImageLabel.xaml rename to src/openHAB.Windows/Controls/ImageLabel.xaml diff --git a/OpenHAB.Windows/Controls/ImageLabel.xaml.cs b/src/openHAB.Windows/Controls/ImageLabel.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ImageLabel.xaml.cs rename to src/openHAB.Windows/Controls/ImageLabel.xaml.cs diff --git a/OpenHAB.Windows/Controls/ImageWidget.xaml b/src/openHAB.Windows/Controls/ImageWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ImageWidget.xaml rename to src/openHAB.Windows/Controls/ImageWidget.xaml diff --git a/OpenHAB.Windows/Controls/ImageWidget.xaml.cs b/src/openHAB.Windows/Controls/ImageWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ImageWidget.xaml.cs rename to src/openHAB.Windows/Controls/ImageWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/MapViewWidget.xaml b/src/openHAB.Windows/Controls/MapViewWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/MapViewWidget.xaml rename to src/openHAB.Windows/Controls/MapViewWidget.xaml diff --git a/OpenHAB.Windows/Controls/MapViewWidget.xaml.cs b/src/openHAB.Windows/Controls/MapViewWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/MapViewWidget.xaml.cs rename to src/openHAB.Windows/Controls/MapViewWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/MjpegWidget.xaml b/src/openHAB.Windows/Controls/MjpegWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/MjpegWidget.xaml rename to src/openHAB.Windows/Controls/MjpegWidget.xaml diff --git a/OpenHAB.Windows/Controls/MjpegWidget.xaml.cs b/src/openHAB.Windows/Controls/MjpegWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/MjpegWidget.xaml.cs rename to src/openHAB.Windows/Controls/MjpegWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/NavMenuListView.cs b/src/openHAB.Windows/Controls/NavMenuListView.cs similarity index 100% rename from OpenHAB.Windows/Controls/NavMenuListView.cs rename to src/openHAB.Windows/Controls/NavMenuListView.cs diff --git a/OpenHAB.Windows/Controls/PageLinkWidget.xaml b/src/openHAB.Windows/Controls/PageLinkWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/PageLinkWidget.xaml rename to src/openHAB.Windows/Controls/PageLinkWidget.xaml diff --git a/OpenHAB.Windows/Controls/PageLinkWidget.xaml.cs b/src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/PageLinkWidget.xaml.cs rename to src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/RadialSlider.cs b/src/openHAB.Windows/Controls/RadialSlider.cs similarity index 100% rename from OpenHAB.Windows/Controls/RadialSlider.cs rename to src/openHAB.Windows/Controls/RadialSlider.cs diff --git a/OpenHAB.Windows/Controls/RollershutterWidget.xaml b/src/openHAB.Windows/Controls/RollershutterWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/RollershutterWidget.xaml rename to src/openHAB.Windows/Controls/RollershutterWidget.xaml diff --git a/OpenHAB.Windows/Controls/RollershutterWidget.xaml.cs b/src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/RollershutterWidget.xaml.cs rename to src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/SectionSwitchWidget.xaml b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/SectionSwitchWidget.xaml rename to src/openHAB.Windows/Controls/SectionSwitchWidget.xaml diff --git a/OpenHAB.Windows/Controls/SectionSwitchWidget.xaml.cs b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/SectionSwitchWidget.xaml.cs rename to src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/SelectionWidget.xaml b/src/openHAB.Windows/Controls/SelectionWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/SelectionWidget.xaml rename to src/openHAB.Windows/Controls/SelectionWidget.xaml diff --git a/OpenHAB.Windows/Controls/SelectionWidget.xaml.cs b/src/openHAB.Windows/Controls/SelectionWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/SelectionWidget.xaml.cs rename to src/openHAB.Windows/Controls/SelectionWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/SetpointWidget.xaml b/src/openHAB.Windows/Controls/SetpointWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/SetpointWidget.xaml rename to src/openHAB.Windows/Controls/SetpointWidget.xaml diff --git a/OpenHAB.Windows/Controls/SetpointWidget.xaml.cs b/src/openHAB.Windows/Controls/SetpointWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/SetpointWidget.xaml.cs rename to src/openHAB.Windows/Controls/SetpointWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/SliderWidget.xaml b/src/openHAB.Windows/Controls/SliderWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/SliderWidget.xaml rename to src/openHAB.Windows/Controls/SliderWidget.xaml diff --git a/OpenHAB.Windows/Controls/SliderWidget.xaml.cs b/src/openHAB.Windows/Controls/SliderWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/SliderWidget.xaml.cs rename to src/openHAB.Windows/Controls/SliderWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/SwitchWidget.xaml b/src/openHAB.Windows/Controls/SwitchWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/SwitchWidget.xaml rename to src/openHAB.Windows/Controls/SwitchWidget.xaml diff --git a/OpenHAB.Windows/Controls/SwitchWidget.xaml.cs b/src/openHAB.Windows/Controls/SwitchWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/SwitchWidget.xaml.cs rename to src/openHAB.Windows/Controls/SwitchWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/TextWidget.xaml b/src/openHAB.Windows/Controls/TextWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/TextWidget.xaml rename to src/openHAB.Windows/Controls/TextWidget.xaml diff --git a/OpenHAB.Windows/Controls/TextWidget.xaml.cs b/src/openHAB.Windows/Controls/TextWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/TextWidget.xaml.cs rename to src/openHAB.Windows/Controls/TextWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/ToggleWidget.xaml b/src/openHAB.Windows/Controls/ToggleWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/ToggleWidget.xaml rename to src/openHAB.Windows/Controls/ToggleWidget.xaml diff --git a/OpenHAB.Windows/Controls/ToggleWidget.xaml.cs b/src/openHAB.Windows/Controls/ToggleWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/ToggleWidget.xaml.cs rename to src/openHAB.Windows/Controls/ToggleWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/WebViewWidget.xaml b/src/openHAB.Windows/Controls/WebViewWidget.xaml similarity index 100% rename from OpenHAB.Windows/Controls/WebViewWidget.xaml rename to src/openHAB.Windows/Controls/WebViewWidget.xaml diff --git a/OpenHAB.Windows/Controls/WebViewWidget.xaml.cs b/src/openHAB.Windows/Controls/WebViewWidget.xaml.cs similarity index 100% rename from OpenHAB.Windows/Controls/WebViewWidget.xaml.cs rename to src/openHAB.Windows/Controls/WebViewWidget.xaml.cs diff --git a/OpenHAB.Windows/Controls/WidgetBase.cs b/src/openHAB.Windows/Controls/WidgetBase.cs similarity index 100% rename from OpenHAB.Windows/Controls/WidgetBase.cs rename to src/openHAB.Windows/Controls/WidgetBase.cs diff --git a/OpenHAB.Windows/Converters/BooleanToVisibilityConverter.cs b/src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/BooleanToVisibilityConverter.cs rename to src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs diff --git a/OpenHAB.Windows/Converters/IconToBitmapConverter.cs b/src/openHAB.Windows/Converters/IconToBitmapConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/IconToBitmapConverter.cs rename to src/openHAB.Windows/Converters/IconToBitmapConverter.cs diff --git a/OpenHAB.Windows/Converters/IconToPathConverter.cs b/src/openHAB.Windows/Converters/IconToPathConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/IconToPathConverter.cs rename to src/openHAB.Windows/Converters/IconToPathConverter.cs diff --git a/OpenHAB.Windows/Converters/MenuItemTemplateSelector.cs b/src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs similarity index 100% rename from OpenHAB.Windows/Converters/MenuItemTemplateSelector.cs rename to src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs diff --git a/OpenHAB.Windows/Converters/NullToBooleanConverter.cs b/src/openHAB.Windows/Converters/NullToBooleanConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/NullToBooleanConverter.cs rename to src/openHAB.Windows/Converters/NullToBooleanConverter.cs diff --git a/OpenHAB.Windows/Converters/ObjectToSitemapConverter.cs b/src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/ObjectToSitemapConverter.cs rename to src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs diff --git a/OpenHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs b/src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs similarity index 100% rename from OpenHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs rename to src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs diff --git a/OpenHAB.Windows/Converters/ReverseBoolConverter.cs b/src/openHAB.Windows/Converters/ReverseBoolConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/ReverseBoolConverter.cs rename to src/openHAB.Windows/Converters/ReverseBoolConverter.cs diff --git a/OpenHAB.Windows/Converters/StateToBoolConverter.cs b/src/openHAB.Windows/Converters/StateToBoolConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/StateToBoolConverter.cs rename to src/openHAB.Windows/Converters/StateToBoolConverter.cs diff --git a/OpenHAB.Windows/Converters/StringToColorBrushConverter.cs b/src/openHAB.Windows/Converters/StringToColorBrushConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/StringToColorBrushConverter.cs rename to src/openHAB.Windows/Converters/StringToColorBrushConverter.cs diff --git a/OpenHAB.Windows/Converters/StringToDoubleConverter.cs b/src/openHAB.Windows/Converters/StringToDoubleConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/StringToDoubleConverter.cs rename to src/openHAB.Windows/Converters/StringToDoubleConverter.cs diff --git a/OpenHAB.Windows/Converters/WidgetTemplateSelector.cs b/src/openHAB.Windows/Converters/WidgetTemplateSelector.cs similarity index 100% rename from OpenHAB.Windows/Converters/WidgetTemplateSelector.cs rename to src/openHAB.Windows/Converters/WidgetTemplateSelector.cs diff --git a/OpenHAB.Windows/Converters/ZeroToVisibilityConverter.cs b/src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs similarity index 100% rename from OpenHAB.Windows/Converters/ZeroToVisibilityConverter.cs rename to src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs diff --git a/OpenHAB.Windows/DIService.cs b/src/openHAB.Windows/DIService.cs similarity index 100% rename from OpenHAB.Windows/DIService.cs rename to src/openHAB.Windows/DIService.cs diff --git a/OpenHAB.Windows/Extensions/ContentDialogExtensions.cs b/src/openHAB.Windows/Extensions/ContentDialogExtensions.cs similarity index 100% rename from OpenHAB.Windows/Extensions/ContentDialogExtensions.cs rename to src/openHAB.Windows/Extensions/ContentDialogExtensions.cs diff --git a/OpenHAB.Windows/GlobalSuppressions.cs b/src/openHAB.Windows/GlobalSuppressions.cs similarity index 100% rename from OpenHAB.Windows/GlobalSuppressions.cs rename to src/openHAB.Windows/GlobalSuppressions.cs diff --git a/OpenHAB.Windows/OpenHAB.Windows_StoreKey.pfx b/src/openHAB.Windows/OpenHAB.Windows_StoreKey.pfx similarity index 100% rename from OpenHAB.Windows/OpenHAB.Windows_StoreKey.pfx rename to src/openHAB.Windows/OpenHAB.Windows_StoreKey.pfx diff --git a/OpenHAB.Windows/Package.StoreAssociation.xml b/src/openHAB.Windows/Package.StoreAssociation.xml similarity index 100% rename from OpenHAB.Windows/Package.StoreAssociation.xml rename to src/openHAB.Windows/Package.StoreAssociation.xml diff --git a/OpenHAB.Windows/Package.appxmanifest b/src/openHAB.Windows/Package.appxmanifest similarity index 100% rename from OpenHAB.Windows/Package.appxmanifest rename to src/openHAB.Windows/Package.appxmanifest diff --git a/OpenHAB.Windows/Properties/Annotations.cs b/src/openHAB.Windows/Properties/Annotations.cs similarity index 100% rename from OpenHAB.Windows/Properties/Annotations.cs rename to src/openHAB.Windows/Properties/Annotations.cs diff --git a/OpenHAB.Windows/Properties/AssemblyInfo.cs b/src/openHAB.Windows/Properties/AssemblyInfo.cs similarity index 100% rename from OpenHAB.Windows/Properties/AssemblyInfo.cs rename to src/openHAB.Windows/Properties/AssemblyInfo.cs diff --git a/OpenHAB.Windows/Properties/Default.rd.xml b/src/openHAB.Windows/Properties/Default.rd.xml similarity index 100% rename from OpenHAB.Windows/Properties/Default.rd.xml rename to src/openHAB.Windows/Properties/Default.rd.xml diff --git a/OpenHAB.Windows/Styles/DefaultTheme.xaml b/src/openHAB.Windows/Styles/DefaultTheme.xaml similarity index 100% rename from OpenHAB.Windows/Styles/DefaultTheme.xaml rename to src/openHAB.Windows/Styles/DefaultTheme.xaml diff --git a/OpenHAB.Windows/Themes/Generic.xaml b/src/openHAB.Windows/Themes/Generic.xaml similarity index 100% rename from OpenHAB.Windows/Themes/Generic.xaml rename to src/openHAB.Windows/Themes/Generic.xaml diff --git a/OpenHAB.Windows/View/LogViewerPage.xaml b/src/openHAB.Windows/View/LogViewerPage.xaml similarity index 100% rename from OpenHAB.Windows/View/LogViewerPage.xaml rename to src/openHAB.Windows/View/LogViewerPage.xaml diff --git a/OpenHAB.Windows/View/LogViewerPage.xaml.cs b/src/openHAB.Windows/View/LogViewerPage.xaml.cs similarity index 100% rename from OpenHAB.Windows/View/LogViewerPage.xaml.cs rename to src/openHAB.Windows/View/LogViewerPage.xaml.cs diff --git a/OpenHAB.Windows/View/MainPage.xaml b/src/openHAB.Windows/View/MainPage.xaml similarity index 100% rename from OpenHAB.Windows/View/MainPage.xaml rename to src/openHAB.Windows/View/MainPage.xaml diff --git a/OpenHAB.Windows/View/MainPage.xaml.cs b/src/openHAB.Windows/View/MainPage.xaml.cs similarity index 100% rename from OpenHAB.Windows/View/MainPage.xaml.cs rename to src/openHAB.Windows/View/MainPage.xaml.cs diff --git a/OpenHAB.Windows/View/SettingsPage.xaml b/src/openHAB.Windows/View/SettingsPage.xaml similarity index 100% rename from OpenHAB.Windows/View/SettingsPage.xaml rename to src/openHAB.Windows/View/SettingsPage.xaml diff --git a/OpenHAB.Windows/View/SettingsPage.xaml.cs b/src/openHAB.Windows/View/SettingsPage.xaml.cs similarity index 100% rename from OpenHAB.Windows/View/SettingsPage.xaml.cs rename to src/openHAB.Windows/View/SettingsPage.xaml.cs diff --git a/OpenHAB.Windows/ViewModel/ConfigurationViewModel.cs b/src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/ConfigurationViewModel.cs rename to src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/ConnectionDialogViewModel.cs b/src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/ConnectionDialogViewModel.cs rename to src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/ConnectionProfileViewModel.cs b/src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/ConnectionProfileViewModel.cs rename to src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/IViewModel.cs b/src/openHAB.Windows/ViewModel/IViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/IViewModel.cs rename to src/openHAB.Windows/ViewModel/IViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/LanguageViewModel.cs b/src/openHAB.Windows/ViewModel/LanguageViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/LanguageViewModel.cs rename to src/openHAB.Windows/ViewModel/LanguageViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/LogsViewModel.cs b/src/openHAB.Windows/ViewModel/LogsViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/LogsViewModel.cs rename to src/openHAB.Windows/ViewModel/LogsViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/MainViewModel.cs b/src/openHAB.Windows/ViewModel/MainViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/MainViewModel.cs rename to src/openHAB.Windows/ViewModel/MainViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/SettingsViewModel.cs b/src/openHAB.Windows/ViewModel/SettingsViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/SettingsViewModel.cs rename to src/openHAB.Windows/ViewModel/SettingsViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/SitemapViewModel.cs b/src/openHAB.Windows/ViewModel/SitemapViewModel.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/SitemapViewModel.cs rename to src/openHAB.Windows/ViewModel/SitemapViewModel.cs diff --git a/OpenHAB.Windows/ViewModel/ViewModelBase.cs b/src/openHAB.Windows/ViewModel/ViewModelBase.cs similarity index 100% rename from OpenHAB.Windows/ViewModel/ViewModelBase.cs rename to src/openHAB.Windows/ViewModel/ViewModelBase.cs diff --git a/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig b/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..479cd4c4 --- /dev/null +++ b/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,8 @@ +is_global = true +build_property.TargetFramework = +build_property.TargetPlatformMinVersion = 10.0.17763.0 +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} +build_property.PublishSingleFile = +build_property.IncludeAllContentForSelfExtract = +build_property._SupportedPlatformList = diff --git a/OpenHAB.Windows/OpenHAB.Windows.csproj b/src/openHAB.Windows/openHAB.Windows.csproj similarity index 98% rename from OpenHAB.Windows/OpenHAB.Windows.csproj rename to src/openHAB.Windows/openHAB.Windows.csproj index 51086e27..53098bc8 100644 --- a/OpenHAB.Windows/OpenHAB.Windows.csproj +++ b/src/openHAB.Windows/openHAB.Windows.csproj @@ -400,14 +400,15 @@ False ..\..\..\..\..\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\XamlCompiler\Microsoft.UI.Xaml.Markup.winmd - - ..\Libs\MJPEGDecoderWinRTLib.dll + + False + ..\..\libaries\MJPEGDecoderWinRTLib.dll - + {2a8fd10e-4ee5-4e25-b47c-2296e071f482} - openHAB.Core + Openhab.Core