From d6e8108e0b3ccc28fef8ae622591c876341af903 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Thu, 1 Dec 2022 17:33:24 -0800 Subject: [PATCH 01/10] Change from __WASM__ to WASM for now to workaround issue with compile constant @Arlodotexe is there an issue filed for this somewhere to track? --- .../Renderers/Markdown/MarkdownTextBlock.cs | 4 ++-- .../SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs b/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs index cf814c957..b10ddd5ab 100644 --- a/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs +++ b/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs @@ -16,7 +16,7 @@ #endif #endif -#if __WASM__ +#if WASM using Markdig; using Uno.Foundation.Interop; using Uno.UI.Runtime.WebAssembly; @@ -27,7 +27,7 @@ namespace CommunityToolkit.Labs.Shared.Renderers; /// /// Provide an abstraction around the Toolkit MarkdownTextBlock for both UWP and WinUI 3 in the same namespace (until 8.0) as well as a polyfill for WebAssembly/WASM. /// -#if __WASM__ +#if WASM [HtmlElement("div")] public partial class MarkdownTextBlock : TextBlock { diff --git a/labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs b/labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs index 0ababf1b0..ab66bdc43 100644 --- a/labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs +++ b/labs/SizerBase/src/Toolkit/FrameworkElementExtensions.Mouse.cs @@ -77,7 +77,7 @@ private static void Element_PointerEntered(object sender, PointerRoutedEventArgs { // TODO: [UNO] Only supported on certain platforms // See PointerCursor here: https://github.com/unoplatform/uno/blob/3fe3862b270b99dbec4d830b547942af61b1a1d9/src/Uno.UWP/UI/Core/CoreWindow.cs#L71-L77 -#if NETFX_CORE || __WASM__ || __MACOS__ || __SKIA__ +#if NETFX_CORE || WASM || __MACOS__ || __SKIA__ CoreCursorType cursor = GetCursor((FrameworkElement)sender); Window.Current.CoreWindow.PointerCursor = _cursors[cursor]; #endif @@ -85,7 +85,7 @@ private static void Element_PointerEntered(object sender, PointerRoutedEventArgs private static void Element_PointerExited(object sender, PointerRoutedEventArgs e) { -#if NETFX_CORE || __WASM__ || __MACOS__ || __SKIA__ +#if NETFX_CORE || WASM || __MACOS__ || __SKIA__ // when exiting change the cursor to the target Mouse.Cursor value of the new element CoreCursor cursor; if (sender != e.OriginalSource && e.OriginalSource is FrameworkElement newElement) From 97e5e8c28b47dd19e88be52adcfeb8fa298e0b48 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Thu, 1 Dec 2022 17:39:36 -0800 Subject: [PATCH 02/10] Remove AssemblyInfo.cs from projects and generate with msbuild WriteCodeFragment --- .gitignore | 1 + common/Labs.Head.props | 68 ++++++++++++++++++- .../CanvasLayout.Uwp/CanvasLayout.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 33 --------- .../CanvasLayout.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 22 ------ .../CanvasView.Uwp/CanvasView.Uwp.csproj | 3 - .../CanvasView.Uwp/Properties/AssemblyInfo.cs | 33 --------- .../CanvasView.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 22 ------ .../RivePlayer.Uwp/Properties/AssemblyInfo.cs | 33 --------- .../RivePlayer.Uwp/RivePlayer.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 22 ------ .../RivePlayer.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 33 --------- .../SettingsControls.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 22 ------ .../SettingsControls.Tests.Uwp.csproj | 1 - .../SizerBase.Uwp/Properties/AssemblyInfo.cs | 33 --------- .../SizerBase.Uwp/SizerBase.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 22 ------ .../SizerBase.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 33 --------- .../StackedNotificationsBehavior.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 22 ------ ...ckedNotificationsBehavior.Tests.Uwp.csproj | 1 - .../CommunityToolkit.Labs.Droid.csproj | 1 - .../Properties/AssemblyInfo.cs | 34 ---------- .../Properties/AssemblyInfo.cs | 33 --------- .../CommunityToolkit.Labs.Uwp.csproj | 8 --- .../Properties/AssemblyInfo.cs | 33 --------- .../CommunityToolkit.Labs.iOS.csproj | 1 - .../Properties/AssemblyInfo.cs | 40 ----------- .../CommunityToolkit.Labs.macOS.csproj | 1 - .../Properties/AssemblyInfo.cs | 40 ----------- .../ProjectTemplate.Uwp.csproj | 3 - .../Properties/AssemblyInfo.cs | 33 --------- .../ProjectTemplate.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 22 ------ .../CommunityToolkit.Labs.Tests.Uwp.csproj | 1 - .../Properties/AssemblyInfo.cs | 21 ------ 41 files changed, 68 insertions(+), 627 deletions(-) delete mode 100644 labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/CanvasView/samples/CanvasView.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/CanvasView/tests/CanvasView.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/RivePlayer/samples/RivePlayer.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/RivePlayer/tests/RivePlayer.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/SettingsControls/samples/SettingsControls.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/SettingsControls/tests/SettingsControls.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/SizerBase/samples/SizerBase.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/SizerBase/tests/SizerBase.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/Properties/AssemblyInfo.cs delete mode 100644 labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 platforms/CommunityToolkit.Labs.Droid/Properties/AssemblyInfo.cs delete mode 100644 platforms/CommunityToolkit.Labs.Skia.WPF.Host/Properties/AssemblyInfo.cs delete mode 100644 platforms/CommunityToolkit.Labs.Uwp/Properties/AssemblyInfo.cs delete mode 100644 platforms/CommunityToolkit.Labs.iOS/Properties/AssemblyInfo.cs delete mode 100644 platforms/CommunityToolkit.Labs.macOS/Properties/AssemblyInfo.cs delete mode 100644 template/lab/samples/ProjectTemplate.Uwp/Properties/AssemblyInfo.cs delete mode 100644 template/lab/tests/ProjectTemplate.Tests.Uwp/Properties/AssemblyInfo.cs delete mode 100644 tests/CommunityToolkit.Labs.Tests.Uwp/Properties/AssemblyInfo.cs diff --git a/.gitignore b/.gitignore index f1f0f0adc..40199a432 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ bld/ # Visual Studio 2017 auto generated files Generated\ Files/ +*.g.cs # MSTest test Results [Tt]est[Rr]esult*/ diff --git a/common/Labs.Head.props b/common/Labs.Head.props index cb4c8ec75..e7c039f4f 100644 --- a/common/Labs.Head.props +++ b/common/Labs.Head.props @@ -20,8 +20,11 @@ - + + + + @@ -59,5 +62,68 @@ true + + + false + + + + + + + <_Parameter1>$projectname$ + + + <_Parameter1>Community Toolkit + + + <_Parameter1>$registeredorganization$ + + + <_Parameter1>$projectname$ + + + <_Parameter1>Copyright © $registeredorganization$ $year$ + + + <_Parameter1> + + + <_Parameter1> + + + <_Parameter1>$(Configuration) + + + <_Parameter1>1.0.0.0 + + + <_Parameter1>1.0.0.0 + + + <_Parameter1>false + <_Parameter1_TypeName>System.Boolean + + + + + <_Parameter1>CommitHash + <_Parameter2>$(SourceRevisionId) + + + + + + + <_Parameter1>Windows10.0.19041.0 + + + <_Parameter1>Windows10.0.17763.0 + + + + + + diff --git a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj index 8c7cfd2e7..3a04906f7 100644 --- a/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj +++ b/labs/CanvasLayout/samples/CanvasLayout.Uwp/CanvasLayout.Uwp.csproj @@ -35,9 +35,6 @@ CanvasLayoutExperiment.Samples.Uwp {C3F460EC-A0A6-4B22-A91A-6CF98B30FD8A} - - - diff --git a/labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs b/labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index fcbafe438..000000000 --- a/labs/CanvasLayout/samples/CanvasLayout.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.CanvasLayout")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.CanvasLayout")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj b/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj index b243e2273..b442541c1 100644 --- a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj +++ b/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/CanvasLayout.Tests.Uwp.csproj @@ -22,7 +22,6 @@ - Designer diff --git a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 9a683646a..000000000 --- a/labs/CanvasLayout/tests/CanvasLayout.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("CanvasLayoutExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CanvasLayoutExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/CanvasView/samples/CanvasView.Uwp/CanvasView.Uwp.csproj b/labs/CanvasView/samples/CanvasView.Uwp/CanvasView.Uwp.csproj index 5016ad2b4..75065bf07 100644 --- a/labs/CanvasView/samples/CanvasView.Uwp/CanvasView.Uwp.csproj +++ b/labs/CanvasView/samples/CanvasView.Uwp/CanvasView.Uwp.csproj @@ -35,9 +35,6 @@ CanvasViewExperiment.Samples.Uwp {11B0021A-DEC6-4942-B478-4367079357E4} - - - diff --git a/labs/CanvasView/samples/CanvasView.Uwp/Properties/AssemblyInfo.cs b/labs/CanvasView/samples/CanvasView.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 3311c814f..000000000 --- a/labs/CanvasView/samples/CanvasView.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.CanvasView")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.CanvasView")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/CanvasView/tests/CanvasView.Tests.Uwp/CanvasView.Tests.Uwp.csproj b/labs/CanvasView/tests/CanvasView.Tests.Uwp/CanvasView.Tests.Uwp.csproj index 5643119da..a00463fd8 100644 --- a/labs/CanvasView/tests/CanvasView.Tests.Uwp/CanvasView.Tests.Uwp.csproj +++ b/labs/CanvasView/tests/CanvasView.Tests.Uwp/CanvasView.Tests.Uwp.csproj @@ -23,7 +23,6 @@ - Designer diff --git a/labs/CanvasView/tests/CanvasView.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/CanvasView/tests/CanvasView.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 7ecbfcb70..000000000 --- a/labs/CanvasView/tests/CanvasView.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("CanvasViewExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CanvasViewExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/RivePlayer/samples/RivePlayer.Uwp/Properties/AssemblyInfo.cs b/labs/RivePlayer/samples/RivePlayer.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 1bf207cf5..000000000 --- a/labs/RivePlayer/samples/RivePlayer.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.RivePlayer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.RivePlayer")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/RivePlayer/samples/RivePlayer.Uwp/RivePlayer.Uwp.csproj b/labs/RivePlayer/samples/RivePlayer.Uwp/RivePlayer.Uwp.csproj index 17b062fdb..ffb82ae79 100644 --- a/labs/RivePlayer/samples/RivePlayer.Uwp/RivePlayer.Uwp.csproj +++ b/labs/RivePlayer/samples/RivePlayer.Uwp/RivePlayer.Uwp.csproj @@ -31,9 +31,6 @@ RivePlayerExperiment.Samples.Uwp {FBB674E6-A495-4628-BC63-22CDFA8EE22C} - - - diff --git a/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 19a4db3e3..000000000 --- a/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("RivePlayerExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("RivePlayerExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/RivePlayer.Tests.Uwp.csproj b/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/RivePlayer.Tests.Uwp.csproj index 6ed8cf16a..bb2cf94e6 100644 --- a/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/RivePlayer.Tests.Uwp.csproj +++ b/labs/RivePlayer/tests/RivePlayer.Tests.Uwp/RivePlayer.Tests.Uwp.csproj @@ -18,7 +18,6 @@ $(VisualStudioVersion) - Designer diff --git a/labs/SettingsControls/samples/SettingsControls.Uwp/Properties/AssemblyInfo.cs b/labs/SettingsControls/samples/SettingsControls.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 00aeb0b35..000000000 --- a/labs/SettingsControls/samples/SettingsControls.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.SettingsControls")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.SettingsControls")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/SettingsControls/samples/SettingsControls.Uwp/SettingsControls.Uwp.csproj b/labs/SettingsControls/samples/SettingsControls.Uwp/SettingsControls.Uwp.csproj index 71aff9ffa..8fec4bfbc 100644 --- a/labs/SettingsControls/samples/SettingsControls.Uwp/SettingsControls.Uwp.csproj +++ b/labs/SettingsControls/samples/SettingsControls.Uwp/SettingsControls.Uwp.csproj @@ -35,9 +35,6 @@ SettingsControlsExperiment.Samples.Uwp {C9AEDEBC-D0AD-4C26-99AA-3AF46965651B} - - - diff --git a/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 55df31c92..000000000 --- a/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("SettingsControlsExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("SettingsControlsExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/SettingsControls.Tests.Uwp.csproj b/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/SettingsControls.Tests.Uwp.csproj index 9a647b68c..34bbbc74d 100644 --- a/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/SettingsControls.Tests.Uwp.csproj +++ b/labs/SettingsControls/tests/SettingsControls.Tests.Uwp/SettingsControls.Tests.Uwp.csproj @@ -23,7 +23,6 @@ - Designer diff --git a/labs/SizerBase/samples/SizerBase.Uwp/Properties/AssemblyInfo.cs b/labs/SizerBase/samples/SizerBase.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index a1882f46a..000000000 --- a/labs/SizerBase/samples/SizerBase.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.SizerBase")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.SizerBase")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj index a7e53c784..a492484a3 100644 --- a/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj +++ b/labs/SizerBase/samples/SizerBase.Uwp/SizerBase.Uwp.csproj @@ -35,9 +35,6 @@ SizerBaseExperiment.Samples.Uwp {F6A025B4-1F2A-4538-87F5-DF7F9C15950F} - - - diff --git a/labs/SizerBase/tests/SizerBase.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/SizerBase/tests/SizerBase.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index d72a914b9..000000000 --- a/labs/SizerBase/tests/SizerBase.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("SizerBaseExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("SizerBaseExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj b/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj index 7ec856870..abd8e32be 100644 --- a/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj +++ b/labs/SizerBase/tests/SizerBase.Tests.Uwp/SizerBase.Tests.Uwp.csproj @@ -22,7 +22,6 @@ - Designer diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/Properties/AssemblyInfo.cs b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 90a850cf2..000000000 --- a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.StackedNotificationsBehavior")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.StackedNotificationsBehavior")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/StackedNotificationsBehavior.Uwp.csproj b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/StackedNotificationsBehavior.Uwp.csproj index d2ad55120..28b78c3c6 100644 --- a/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/StackedNotificationsBehavior.Uwp.csproj +++ b/labs/StackedNotificationsBehavior/samples/StackedNotificationsBehavior.Uwp/StackedNotificationsBehavior.Uwp.csproj @@ -35,9 +35,6 @@ StackedNotificationsBehaviorExperiment.Samples.Uwp {59EF2B08-F5FB-4182-8361-94B8475C4C6D} - - - diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/Properties/AssemblyInfo.cs b/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index bd192e0a8..000000000 --- a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("StackedNotificationsBehaviorExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("StackedNotificationsBehaviorExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/StackedNotificationsBehavior.Tests.Uwp.csproj b/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/StackedNotificationsBehavior.Tests.Uwp.csproj index 8fe64ca9c..26759d350 100644 --- a/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/StackedNotificationsBehavior.Tests.Uwp.csproj +++ b/labs/StackedNotificationsBehavior/tests/StackedNotificationsBehavior.Tests.Uwp/StackedNotificationsBehavior.Tests.Uwp.csproj @@ -23,7 +23,6 @@ - Designer diff --git a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj index e2ca8e27e..a64b58a74 100644 --- a/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj +++ b/platforms/CommunityToolkit.Labs.Droid/CommunityToolkit.Labs.Droid.csproj @@ -106,7 +106,6 @@ - diff --git a/platforms/CommunityToolkit.Labs.Droid/Properties/AssemblyInfo.cs b/platforms/CommunityToolkit.Labs.Droid/Properties/AssemblyInfo.cs deleted file mode 100644 index 0bc0ff6c3..000000000 --- a/platforms/CommunityToolkit.Labs.Droid/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using Android.App; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("$projectname$")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("$registeredorganization$")] -[assembly: AssemblyProduct("$projectname$")] -[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/Properties/AssemblyInfo.cs b/platforms/CommunityToolkit.Labs.Skia.WPF.Host/Properties/AssemblyInfo.cs deleted file mode 100644 index 47ae58f14..000000000 --- a/platforms/CommunityToolkit.Labs.Skia.WPF.Host/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] diff --git a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj index d17f7aaa8..07b75845c 100644 --- a/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj +++ b/platforms/CommunityToolkit.Labs.Uwp/CommunityToolkit.Labs.Uwp.csproj @@ -1,7 +1,6 @@  - @@ -23,22 +22,16 @@ false - - - CommunityToolkit.Labs.Uwp CommunityToolkit.Labs.Uwp {B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7} - - - @@ -47,7 +40,6 @@ Designer - \ No newline at end of file diff --git a/platforms/CommunityToolkit.Labs.Uwp/Properties/AssemblyInfo.cs b/platforms/CommunityToolkit.Labs.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index fbd66ae62..000000000 --- a/platforms/CommunityToolkit.Labs.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("$projectname$")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("$registeredorganization$")] -[assembly: AssemblyProduct("$projectname$")] -[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj index 04536b3de..1da9167de 100644 --- a/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj +++ b/platforms/CommunityToolkit.Labs.iOS/CommunityToolkit.Labs.iOS.csproj @@ -130,7 +130,6 @@ - diff --git a/platforms/CommunityToolkit.Labs.iOS/Properties/AssemblyInfo.cs b/platforms/CommunityToolkit.Labs.iOS/Properties/AssemblyInfo.cs deleted file mode 100644 index 473eb9fd2..000000000 --- a/platforms/CommunityToolkit.Labs.iOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("$projectname$")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("$registeredorganization$")] -[assembly: AssemblyProduct("$projectname$")] -[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj index 118786b21..630b320a0 100644 --- a/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj +++ b/platforms/CommunityToolkit.Labs.macOS/CommunityToolkit.Labs.macOS.csproj @@ -127,7 +127,6 @@ - diff --git a/platforms/CommunityToolkit.Labs.macOS/Properties/AssemblyInfo.cs b/platforms/CommunityToolkit.Labs.macOS/Properties/AssemblyInfo.cs deleted file mode 100644 index e98129670..000000000 --- a/platforms/CommunityToolkit.Labs.macOS/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,40 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("$projectname$")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("$registeredorganization$")] -[assembly: AssemblyProduct("$projectname$")] -[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("166de4ca-8f11-4ef9-bcf8-3e7834988e7d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj index 313d8fea8..f82fb8c64 100644 --- a/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj +++ b/template/lab/samples/ProjectTemplate.Uwp/ProjectTemplate.Uwp.csproj @@ -35,9 +35,6 @@ ProjectTemplateExperiment.Samples.Uwp {E25BF6D0-24D6-459C-A180-1E9405D59F87} - - - diff --git a/template/lab/samples/ProjectTemplate.Uwp/Properties/AssemblyInfo.cs b/template/lab/samples/ProjectTemplate.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index ebc9b7e0e..000000000 --- a/template/lab/samples/ProjectTemplate.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Uwp.Samples.ProjectTemplate")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Uwp.Samples.ProjectTemplate")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation CUR_YEAR")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] diff --git a/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj b/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj index 0dfc55f9f..996f038db 100644 --- a/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj +++ b/template/lab/tests/ProjectTemplate.Tests.Uwp/ProjectTemplate.Tests.Uwp.csproj @@ -23,7 +23,6 @@ - Designer diff --git a/template/lab/tests/ProjectTemplate.Tests.Uwp/Properties/AssemblyInfo.cs b/template/lab/tests/ProjectTemplate.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index be6d6d1ee..000000000 --- a/template/lab/tests/ProjectTemplate.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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 more information. - -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("ProjectTemplateExperiment.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("ProjectTemplateExperiment.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation CUR_YEAR")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] \ No newline at end of file diff --git a/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj b/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj index 3e86f32a5..32d63f6a2 100644 --- a/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj +++ b/tests/CommunityToolkit.Labs.Tests.Uwp/CommunityToolkit.Labs.Tests.Uwp.csproj @@ -23,7 +23,6 @@ - Designer diff --git a/tests/CommunityToolkit.Labs.Tests.Uwp/Properties/AssemblyInfo.cs b/tests/CommunityToolkit.Labs.Tests.Uwp/Properties/AssemblyInfo.cs deleted file mode 100644 index 78b13f531..000000000 --- a/tests/CommunityToolkit.Labs.Tests.Uwp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("CommunityToolkit.Labs.Tests.Uwp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany(".NET Foundation")] -[assembly: AssemblyProduct("CommunityToolkit.Labs.Tests.Uwp")] -[assembly: AssemblyCopyright("Copyright © .NET Foundation 2022")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyMetadata("TargetPlatform","UAP")] - -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: ComVisible(false)] From 9a50c7bc91522c440449df2acad3eec1a2b25bb3 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Thu, 1 Dec 2022 17:40:22 -0800 Subject: [PATCH 03/10] Add PackageProjectUrl Assembly Metadata Attribute to retrieve GitHub url for links in samples Fixes #326 --- .../CommunityToolkit.Labs.Shared.projitems | 1 + .../Helpers/PackageProjectUrlAttribute.cs | 18 ++++++++++++++++++ .../ToolkitDocumentationRenderer.xaml | 4 ++-- .../ToolkitDocumentationRenderer.xaml.cs | 10 +++++++++- common/Labs.Head.props | 3 +++ 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 common/CommunityToolkit.Labs.Shared/Helpers/PackageProjectUrlAttribute.cs diff --git a/common/CommunityToolkit.Labs.Shared/CommunityToolkit.Labs.Shared.projitems b/common/CommunityToolkit.Labs.Shared/CommunityToolkit.Labs.Shared.projitems index eea80ae98..e4299fd40 100644 --- a/common/CommunityToolkit.Labs.Shared/CommunityToolkit.Labs.Shared.projitems +++ b/common/CommunityToolkit.Labs.Shared/CommunityToolkit.Labs.Shared.projitems @@ -28,6 +28,7 @@ + GettingStartedPage.xaml diff --git a/common/CommunityToolkit.Labs.Shared/Helpers/PackageProjectUrlAttribute.cs b/common/CommunityToolkit.Labs.Shared/Helpers/PackageProjectUrlAttribute.cs new file mode 100644 index 000000000..450465b14 --- /dev/null +++ b/common/CommunityToolkit.Labs.Shared/Helpers/PackageProjectUrlAttribute.cs @@ -0,0 +1,18 @@ +// 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 more information. + +using System; + +namespace CommunityToolkit.Attributes; + +[AttributeUsage(AttributeTargets.Assembly)] +public class PackageProjectUrlAttribute : Attribute +{ + public string PackageProjectUrl { get; set; } + + public PackageProjectUrlAttribute(string url) + { + PackageProjectUrl = url; + } +} diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml index cd07cdfe4..d172fb2e8 100644 --- a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml +++ b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml @@ -125,7 +125,7 @@ - + @@ -147,7 +147,7 @@ - + diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs index fac7e0b78..6cde2a542 100644 --- a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs +++ b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs @@ -24,6 +24,7 @@ public sealed partial class ToolkitDocumentationRenderer : Page { private const string MarkdownRegexSampleTagExpression = @"^>\s*\[!SAMPLE\s*(?.*)\s*\]\s*$"; private static readonly Regex MarkdownRegexSampleTag = new Regex(MarkdownRegexSampleTagExpression, RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Multiline); + private static string? ProjectUrl = null; public ToolkitDocumentationRenderer() { @@ -82,6 +83,13 @@ protected override void OnNavigatedTo(NavigationEventArgs e) base.OnNavigatedTo(e); Metadata = (ToolkitFrontMatter)e.Parameter; + + if (ProjectUrl == null) + { + ProjectUrl = Assembly.GetExecutingAssembly()?.GetCustomAttribute()?.PackageProjectUrl; + } + + // TODO: If ProjectUrl is still null should we log an error? } private async Task LoadData() @@ -214,7 +222,7 @@ private async void MarkdownTextBlock_LinkClicked(object sender, LinkClickedEvent } #endif - public static Uri ToLabsUri(string path, int id) => new Uri($"https://github.com/CommunityToolkit/Labs-Windows/{path}/{id}"); + public static Uri ToGitHubUri(string path, int id) => new Uri($"{ProjectUrl}/{path}/{id}"); public static Visibility IsIdValid(int id) => id switch { diff --git a/common/Labs.Head.props b/common/Labs.Head.props index e7c039f4f..81499a833 100644 --- a/common/Labs.Head.props +++ b/common/Labs.Head.props @@ -111,6 +111,9 @@ <_Parameter1>CommitHash <_Parameter2>$(SourceRevisionId) + + <_Parameter1>$(PackageProjectUrl) + From eaf9fa17826ea18a145c344a258e9d8abc344831 Mon Sep 17 00:00:00 2001 From: michael-hawker <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 6 Dec 2022 10:51:39 -0800 Subject: [PATCH 04/10] Fix issue with AssemblyMetadata not being read on WASM --- .../Renderers/ToolkitDocumentationRenderer.xaml | 6 ++---- .../ToolkitDocumentationRenderer.xaml.cs | 15 ++++++++------- common/Labs.Head.Wasm.props | 4 ++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml index d172fb2e8..10dfa5e3f 100644 --- a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml +++ b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml @@ -115,8 +115,7 @@ - -