From ccce3eb73a5300165e9bb072e5ab1488d13d0710 Mon Sep 17 00:00:00 2001 From: Chris Pulman Date: Sat, 21 Sep 2024 14:16:51 +0100 Subject: [PATCH] Housekeeping Update project configuration --- .github/workflows/ci-build.yml | 2 -- .github/workflows/release.yml | 2 -- src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj | 4 ++-- src/ReactiveUI.Uno.sln | 3 +-- src/ReactiveUI.Uno/ActivationForViewFetcher.cs | 2 +- src/ReactiveUI.Uno/ActivationHelper.cs | 2 +- src/ReactiveUI.Uno/Common/AutoDataTemplateBindingHook.cs | 2 +- src/ReactiveUI.Uno/Common/BooleanToVisibilityHint.cs | 2 +- .../Common/BooleanToVisibilityTypeConverter.cs | 2 +- src/ReactiveUI.Uno/Common/PlatformOperations.cs | 2 +- src/ReactiveUI.Uno/Common/ReactivePage.cs | 2 +- src/ReactiveUI.Uno/Common/ReactiveUserControl.cs | 2 +- src/ReactiveUI.Uno/Common/RoutedViewHost.cs | 2 +- src/ReactiveUI.Uno/Common/ViewModelViewHost.cs | 2 +- src/ReactiveUI.Uno/DependencyObjectObservableForProperty.cs | 2 +- src/ReactiveUI.Uno/ReactiveUI.Uno.csproj | 4 ++-- src/ReactiveUI.Uno/Registrations.cs | 2 +- src/ReactiveUI.Uno/TransitioningContentControl.Empty.cs | 2 +- src/ReactiveUI.Uno/WinRTAppDataDriver.cs | 2 +- src/global.json | 5 ----- src/stylecop.json | 2 +- 21 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 src/global.json diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ca5ab22..426703f 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -15,6 +15,4 @@ jobs: with: configuration: Release productNamespacePrefix: "ReactiveUI" - useVisualStudioPreview: false - useMauiCheckDotNetTool: false solutionFile: "reactiveui.uno.sln" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8557710..daf27d1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,8 +15,6 @@ jobs: with: configuration: Release productNamespacePrefix: "ReactiveUI" - useVisualStudioPreview: false - useMauiCheckDotNetTool: false solutionFile: "reactiveui.uno.sln" secrets: SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }} diff --git a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj index b48e524..0d8816a 100644 --- a/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj +++ b/src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj @@ -1,4 +1,4 @@ - + $(UnoTargetFrameworks);net8.0-windows10.0.19041.0 ReactiveUI.Uno.WinUI @@ -17,7 +17,7 @@ - + diff --git a/src/ReactiveUI.Uno.sln b/src/ReactiveUI.Uno.sln index 903f92d..e57bafe 100644 --- a/src/ReactiveUI.Uno.sln +++ b/src/ReactiveUI.Uno.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 +# 17 VisualStudioVersion = 17.0.31825.309 MinimumVisualStudioVersion = 16.0.31613.86 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD9762CF-E104-481C-96A6-26E624B86283}" @@ -9,7 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\.gitignore = ..\.gitignore Directory.build.props = Directory.build.props Directory.build.targets = Directory.build.targets - global.json = global.json ..\LICENSE = ..\LICENSE ..\README.md = ..\README.md stylecop.json = stylecop.json diff --git a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs index de95136..7a6e808 100644 --- a/src/ReactiveUI.Uno/ActivationForViewFetcher.cs +++ b/src/ReactiveUI.Uno/ActivationForViewFetcher.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/ActivationHelper.cs b/src/ReactiveUI.Uno/ActivationHelper.cs index 482d0f2..6aa10a8 100644 --- a/src/ReactiveUI.Uno/ActivationHelper.cs +++ b/src/ReactiveUI.Uno/ActivationHelper.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/AutoDataTemplateBindingHook.cs b/src/ReactiveUI.Uno/Common/AutoDataTemplateBindingHook.cs index 30331be..b52522f 100644 --- a/src/ReactiveUI.Uno/Common/AutoDataTemplateBindingHook.cs +++ b/src/ReactiveUI.Uno/Common/AutoDataTemplateBindingHook.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/BooleanToVisibilityHint.cs b/src/ReactiveUI.Uno/Common/BooleanToVisibilityHint.cs index e85f467..fff846e 100644 --- a/src/ReactiveUI.Uno/Common/BooleanToVisibilityHint.cs +++ b/src/ReactiveUI.Uno/Common/BooleanToVisibilityHint.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/BooleanToVisibilityTypeConverter.cs b/src/ReactiveUI.Uno/Common/BooleanToVisibilityTypeConverter.cs index ec220d8..0639d92 100644 --- a/src/ReactiveUI.Uno/Common/BooleanToVisibilityTypeConverter.cs +++ b/src/ReactiveUI.Uno/Common/BooleanToVisibilityTypeConverter.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/PlatformOperations.cs b/src/ReactiveUI.Uno/Common/PlatformOperations.cs index 192b177..207df3f 100644 --- a/src/ReactiveUI.Uno/Common/PlatformOperations.cs +++ b/src/ReactiveUI.Uno/Common/PlatformOperations.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/ReactivePage.cs b/src/ReactiveUI.Uno/Common/ReactivePage.cs index 1cef2ae..0077d8e 100644 --- a/src/ReactiveUI.Uno/Common/ReactivePage.cs +++ b/src/ReactiveUI.Uno/Common/ReactivePage.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/ReactiveUserControl.cs b/src/ReactiveUI.Uno/Common/ReactiveUserControl.cs index 1b8596e..ab3d4a7 100644 --- a/src/ReactiveUI.Uno/Common/ReactiveUserControl.cs +++ b/src/ReactiveUI.Uno/Common/ReactiveUserControl.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/RoutedViewHost.cs b/src/ReactiveUI.Uno/Common/RoutedViewHost.cs index 4147571..31b895e 100644 --- a/src/ReactiveUI.Uno/Common/RoutedViewHost.cs +++ b/src/ReactiveUI.Uno/Common/RoutedViewHost.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/Common/ViewModelViewHost.cs b/src/ReactiveUI.Uno/Common/ViewModelViewHost.cs index 6da5f87..4a780fc 100644 --- a/src/ReactiveUI.Uno/Common/ViewModelViewHost.cs +++ b/src/ReactiveUI.Uno/Common/ViewModelViewHost.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/DependencyObjectObservableForProperty.cs b/src/ReactiveUI.Uno/DependencyObjectObservableForProperty.cs index c92a3f8..e372f03 100644 --- a/src/ReactiveUI.Uno/DependencyObjectObservableForProperty.cs +++ b/src/ReactiveUI.Uno/DependencyObjectObservableForProperty.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj index 7452042..8cf93b9 100644 --- a/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj +++ b/src/ReactiveUI.Uno/ReactiveUI.Uno.csproj @@ -1,4 +1,4 @@ - + $(UnoTargetFrameworks) ReactiveUI.Uno @@ -7,6 +7,6 @@ - + diff --git a/src/ReactiveUI.Uno/Registrations.cs b/src/ReactiveUI.Uno/Registrations.cs index 76c72f7..5197bee 100644 --- a/src/ReactiveUI.Uno/Registrations.cs +++ b/src/ReactiveUI.Uno/Registrations.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/TransitioningContentControl.Empty.cs b/src/ReactiveUI.Uno/TransitioningContentControl.Empty.cs index 69db1bb..4d90ee5 100644 --- a/src/ReactiveUI.Uno/TransitioningContentControl.Empty.cs +++ b/src/ReactiveUI.Uno/TransitioningContentControl.Empty.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/ReactiveUI.Uno/WinRTAppDataDriver.cs b/src/ReactiveUI.Uno/WinRTAppDataDriver.cs index fc6f62c..60246fa 100644 --- a/src/ReactiveUI.Uno/WinRTAppDataDriver.cs +++ b/src/ReactiveUI.Uno/WinRTAppDataDriver.cs @@ -1,4 +1,4 @@ -// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved. +// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved. // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for full license information. diff --git a/src/global.json b/src/global.json deleted file mode 100644 index 5cfa01d..0000000 --- a/src/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "msbuild-sdks": { - "MSBuild.Sdk.Extras": "3.0.44" - } -} diff --git a/src/stylecop.json b/src/stylecop.json index f0ada96..d312166 100644 --- a/src/stylecop.json +++ b/src/stylecop.json @@ -13,7 +13,7 @@ "documentPrivateFields": false, "documentationCulture": "en-US", "companyName": ".NET Foundation and Contributors", - "copyrightText": "Copyright (c) 2023 {companyName}. All rights reserved.\nLicensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the {licenseName} license.\nSee the {licenseFile} file in the project root for full license information.", + "copyrightText": "Copyright (c) 2024 {companyName}. All rights reserved.\nLicensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the {licenseName} license.\nSee the {licenseFile} file in the project root for full license information.", "variables": { "licenseName": "MIT", "licenseFile": "LICENSE"