diff --git a/Directory.Build.props b/Directory.Build.props index f5548bd29..37633b985 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,8 @@ + 0 + 1 + CommunityToolkit.Labs $(MSBuildThisFileDirectory) $(RepositoryDirectory)\tooling diff --git a/components/AppServices/samples/AppServices.Samples.csproj b/components/AppServices/samples/AppServices.Samples.csproj deleted file mode 100644 index 9d6b70dbf..000000000 --- a/components/AppServices/samples/AppServices.Samples.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - AppServices - - - - - diff --git a/components/AppServices/samples/MultiTarget.props b/components/AppServices/samples/MultiTarget.props deleted file mode 100644 index 0c55bf4f7..000000000 --- a/components/AppServices/samples/MultiTarget.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - uwp; - - diff --git a/components/AppServices/src/CommunityToolkit.AppServices.csproj b/components/AppServices/src/CommunityToolkit.AppServices.csproj index 01ca2ebed..0156175f9 100644 --- a/components/AppServices/src/CommunityToolkit.AppServices.csproj +++ b/components/AppServices/src/CommunityToolkit.AppServices.csproj @@ -3,7 +3,6 @@ AppServices This package contains AppServices, to easily communicate between UWP apps and Win32 extensions. true - 0.0.3 CommunityToolkit.AppServices $(PackageIdPrefix).$(ToolkitComponentName) false diff --git a/components/CanvasLayout/src/AdditionalAssemblyInfo.cs b/components/CanvasLayout/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 9ea9d8107..000000000 --- a/components/CanvasLayout/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("CanvasLayout.Tests.Uwp")] -[assembly: InternalsVisibleTo("CanvasLayout.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj index 9e65e1149..d603af62f 100644 --- a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj +++ b/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj @@ -2,8 +2,7 @@ CanvasLayout This package contains a CanvasLayout Layout for ItemsRepeater. - 0.0.3 - + CommunityToolkit.Labs.WinUI.CanvasLayoutRns diff --git a/components/CanvasView/src/AdditionalAssemblyInfo.cs b/components/CanvasView/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 123e5dec6..000000000 --- a/components/CanvasView/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("CanvasView.Tests.Uwp")] -[assembly: InternalsVisibleTo("CanvasView.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj b/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj index 3608c862f..dc77a7109 100644 --- a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj +++ b/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj @@ -2,8 +2,7 @@ CanvasView This package contains CanvasView. - 0.0.2 - + CommunityToolkit.Labs.WinUI.CanvasViewRns diff --git a/components/CanvasView/src/Dependencies.props b/components/CanvasView/src/Dependencies.props index 584bfba41..82dae261e 100644 --- a/components/CanvasView/src/Dependencies.props +++ b/components/CanvasView/src/Dependencies.props @@ -11,21 +11,21 @@ - + - + - + - + diff --git a/components/Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj b/components/Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj index 2b400d250..175e21b73 100644 --- a/components/Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj +++ b/components/Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj @@ -3,7 +3,6 @@ Extensions.DependencyInjection This package contains Extensions.DependencyInjection. true - 0.0.1 CommunityToolkit.Extensions.DependencyInjection $(PackageIdPrefix).$(ToolkitComponentName) diff --git a/components/MarqueeText/src/AdditionalAssemblyInfo.cs b/components/MarqueeText/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 6c26144a5..000000000 --- a/components/MarqueeText/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("MarqueeText.Tests.Uwp")] -[assembly: InternalsVisibleTo("MarqueeText.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.WinAppSdk")] diff --git a/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj b/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj index 4dacf68fe..d366b36bd 100644 --- a/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj +++ b/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj @@ -2,8 +2,7 @@ MarqueeText This package contains MarqueeText. - 0.0.3 - + CommunityToolkit.Labs.WinUI.MarqueeTextRns diff --git a/components/RivePlayer/samples/Dependencies.props b/components/RivePlayer/samples/Dependencies.props index 4d73ab9ce..5c51fc792 100644 --- a/components/RivePlayer/samples/Dependencies.props +++ b/components/RivePlayer/samples/Dependencies.props @@ -12,24 +12,24 @@ - + - + - + - + diff --git a/components/RivePlayer/src/AdditionalAssemblyInfo.cs b/components/RivePlayer/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 462a5e178..000000000 --- a/components/RivePlayer/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,19 +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; - - - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("RivePlayer.Tests.Uwp")] -[assembly: InternalsVisibleTo("RivePlayer.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj index 20a43cbfb..d30fa6041 100644 --- a/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj +++ b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj @@ -2,8 +2,7 @@ RivePlayer This package contains RivePlayer. - 0.0.4 - + CommunityToolkit.Labs.WinUI.RivePlayerRns diff --git a/components/SegmentedControl/src/AdditionalAssemblyInfo.cs b/components/SegmentedControl/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 60a66bedc..000000000 --- a/components/SegmentedControl/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("SegmentedControl.Tests.Uwp")] -[assembly: InternalsVisibleTo("SegmentedControl.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj index f4164076c..8c27da340 100644 --- a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj +++ b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj @@ -2,8 +2,7 @@ SegmentedControl This package contains SegmentedControl. - 0.0.3 - + CommunityToolkit.Labs.WinUI.SegmentedControlRns diff --git a/components/SegmentedControl/src/Dependencies.props b/components/SegmentedControl/src/Dependencies.props index 584bfba41..82dae261e 100644 --- a/components/SegmentedControl/src/Dependencies.props +++ b/components/SegmentedControl/src/Dependencies.props @@ -11,21 +11,21 @@ - + - + - + - + diff --git a/components/Shimmer/src/AdditionalAssemblyInfo.cs b/components/Shimmer/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 9796b0d87..000000000 --- a/components/Shimmer/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("Shimmer.Tests.Uwp")] -[assembly: InternalsVisibleTo("Shimmer.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj b/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj index 3ab753c9f..477c3456d 100644 --- a/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj +++ b/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj @@ -2,8 +2,7 @@ Shimmer This package contains Shimmer. - 0.0.1 - + CommunityToolkit.Labs.WinUI.ShimmerRns diff --git a/components/Shimmer/src/Dependencies.props b/components/Shimmer/src/Dependencies.props index dafcc140c..c8ad985bc 100644 --- a/components/Shimmer/src/Dependencies.props +++ b/components/Shimmer/src/Dependencies.props @@ -12,24 +12,24 @@ - + - + - + - + diff --git a/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs b/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 362dbb116..000000000 --- a/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("StackedNotificationsBehavior.Tests.Uwp")] -[assembly: InternalsVisibleTo("StackedNotificationsBehavior.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")] diff --git a/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj b/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj index cfe3100ad..7b822b964 100644 --- a/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj +++ b/components/StackedNotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj @@ -2,8 +2,7 @@ StackedNotificationsBehavior This package contains StackedNotificationsBehavior. - 0.0.2 - + CommunityToolkit.Labs.WinUI.StackedNotificationsBehaviorRns diff --git a/components/StackedNotificationsBehavior/src/Dependencies.props b/components/StackedNotificationsBehavior/src/Dependencies.props index 2a6c9793f..244de5787 100644 --- a/components/StackedNotificationsBehavior/src/Dependencies.props +++ b/components/StackedNotificationsBehavior/src/Dependencies.props @@ -11,21 +11,21 @@ - + - + - + - + diff --git a/components/TokenView/src/AdditionalAssemblyInfo.cs b/components/TokenView/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index d4827db16..000000000 --- a/components/TokenView/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("TokenView.Tests.Uwp")] -[assembly: InternalsVisibleTo("TokenView.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.WinAppSdk")] diff --git a/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj b/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj index 547236d39..5d6786bb1 100644 --- a/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj +++ b/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj @@ -2,8 +2,7 @@ TokenView This package contains TokenView. - 0.0.6 - + CommunityToolkit.Labs.WinUI.TokenViewRns diff --git a/components/TokenView/src/Dependencies.props b/components/TokenView/src/Dependencies.props index de9c4e3e5..0564b41dc 100644 --- a/components/TokenView/src/Dependencies.props +++ b/components/TokenView/src/Dependencies.props @@ -11,25 +11,25 @@ - - + + - - + + - - + + - - + + diff --git a/components/TransitionHelper/samples/Dependencies.props b/components/TransitionHelper/samples/Dependencies.props index 2a6c9793f..244de5787 100644 --- a/components/TransitionHelper/samples/Dependencies.props +++ b/components/TransitionHelper/samples/Dependencies.props @@ -11,21 +11,21 @@ - + - + - + - + diff --git a/components/TransitionHelper/src/AdditionalAssemblyInfo.cs b/components/TransitionHelper/src/AdditionalAssemblyInfo.cs deleted file mode 100644 index 79bbf3e5d..000000000 --- a/components/TransitionHelper/src/AdditionalAssemblyInfo.cs +++ /dev/null @@ -1,13 +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.Runtime.CompilerServices; - -// These `InternalsVisibleTo` calls are intended to make it easier for -// for any internal code to be testable in all the different test projects -// used with the Labs infrastructure. -[assembly: InternalsVisibleTo("TransitionHelper.Tests.Uwp")] -[assembly: InternalsVisibleTo("TransitionHelper.Tests.WinAppSdk")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.Uwp")] -[assembly: InternalsVisibleTo("CommunityToolkit.Labs.Tests.WinAppSdk")] diff --git a/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj b/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj index 21bdbf281..f527c930f 100644 --- a/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj +++ b/components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj @@ -2,8 +2,7 @@ TransitionHelper This package contains a TransitionHelper. - 0.0.1 - + CommunityToolkit.Labs.WinUI.TransitionHelperRns diff --git a/components/TransitionHelper/src/Dependencies.props b/components/TransitionHelper/src/Dependencies.props index 80fdaa931..742ca06ac 100644 --- a/components/TransitionHelper/src/Dependencies.props +++ b/components/TransitionHelper/src/Dependencies.props @@ -11,25 +11,25 @@ - - + + - - + + - - + + - - + + diff --git a/tooling b/tooling index 57bce71ce..02a05b95f 160000 --- a/tooling +++ b/tooling @@ -1 +1 @@ -Subproject commit 57bce71cea3e692ae1dac0ba811494345e8954d9 +Subproject commit 02a05b95f0366f14565fc6d7ad3625b3526de819