Updated tooling to latest main (#481)

* Remove empty sample project * Updated tooling to latest main * Update components to conform to latest tooling changes * Update all component dependencies to use new unified build of new Windows repo packages * Fix TokenView referencing old name of Primitives package --------- Co-authored-by: michael-hawker <[email protected]>
CommunityToolkit · Aug 1, 2023 · ae49c93 · ae49c93
1 parent a577103
commit ae49c93
Show file tree

Hide file tree

Showing 32 changed files with 53 additions and 201 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,8 @@
 <Project>
   <PropertyGroup>
+    <MajorVersion>0</MajorVersion>
+    <MinorVersion>1</MinorVersion>
+
     <PackageIdPrefix>CommunityToolkit.Labs</PackageIdPrefix>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>

diff --git a/components/AppServices/samples/AppServices.Samples.csproj b/components/AppServices/samples/AppServices.Samples.csproj
diff --git a/components/AppServices/samples/MultiTarget.props b/components/AppServices/samples/MultiTarget.props
diff --git a/components/AppServices/src/CommunityToolkit.AppServices.csproj b/components/AppServices/src/CommunityToolkit.AppServices.csproj
@@ -3,7 +3,6 @@
     <ToolkitComponentName>AppServices</ToolkitComponentName>
     <Description>This package contains AppServices, to easily communicate between UWP apps and Win32 extensions.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>0.0.3</Version>
     <RootNamespace>CommunityToolkit.AppServices</RootNamespace>
     <PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
     <HasWinUI>false</HasWinUI>

diff --git a/components/CanvasLayout/src/AdditionalAssemblyInfo.cs b/components/CanvasLayout/src/AdditionalAssemblyInfo.cs
diff --git a/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>CanvasLayout</ToolkitComponentName>
     <Description>This package contains a CanvasLayout Layout for ItemsRepeater.</Description>
-    <Version>0.0.3</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.CanvasLayoutRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/CanvasView/src/AdditionalAssemblyInfo.cs b/components/CanvasView/src/AdditionalAssemblyInfo.cs
diff --git a/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj b/components/CanvasView/src/CommunityToolkit.Labs.WinUI.CanvasView.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>CanvasView</ToolkitComponentName>
     <Description>This package contains CanvasView.</Description>
-    <Version>0.0.2</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.CanvasViewRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/CanvasView/src/Dependencies.props b/components/CanvasView/src/Dependencies.props
@@ -11,21 +11,21 @@
 <Project>
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 2 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 </Project>
diff --git a/...Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj b/...Extensions.DependencyInjection/src/CommunityToolkit.Extensions.DependencyInjection.csproj
@@ -3,7 +3,6 @@
     <ToolkitComponentName>Extensions.DependencyInjection</ToolkitComponentName>
     <Description>This package contains Extensions.DependencyInjection.</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <Version>0.0.1</Version>
     <RootNamespace>CommunityToolkit.Extensions.DependencyInjection</RootNamespace>
     <PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>

diff --git a/components/MarqueeText/src/AdditionalAssemblyInfo.cs b/components/MarqueeText/src/AdditionalAssemblyInfo.cs
diff --git a/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj b/components/MarqueeText/src/CommunityToolkit.Labs.WinUI.MarqueeText.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>MarqueeText</ToolkitComponentName>
     <Description>This package contains MarqueeText.</Description>
-    <Version>0.0.3</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.MarqueeTextRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/RivePlayer/samples/Dependencies.props b/components/RivePlayer/samples/Dependencies.props
@@ -12,24 +12,24 @@
     <!-- WinUI 2 / UWP -->
     <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
-        <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.1"/>
+        <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
     </ItemGroup>
 
     <!-- WinUI 2 / Uno -->
     <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
         <!-- <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.11"/> -->
-        <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.1"/>
+        <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
     </ItemGroup>
 
     <!-- WinUI 3 / WinAppSdk -->
     <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
         <!-- <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2"/> -->
-        <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
+        <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
     </ItemGroup>
 
     <!-- WinUI 3 / Uno -->
     <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
         <!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.100-dev.15.g12261e2626"/> -->
-        <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
+        <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
     </ItemGroup>
 </Project>
diff --git a/components/RivePlayer/src/AdditionalAssemblyInfo.cs b/components/RivePlayer/src/AdditionalAssemblyInfo.cs
diff --git a/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj b/components/RivePlayer/src/CommunityToolkit.Labs.WinUI.Rive.RivePlayer.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>RivePlayer</ToolkitComponentName>
     <Description>This package contains RivePlayer.</Description>
-    <Version>0.0.4</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.RivePlayerRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/SegmentedControl/src/AdditionalAssemblyInfo.cs b/components/SegmentedControl/src/AdditionalAssemblyInfo.cs
diff --git a/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj b/components/SegmentedControl/src/CommunityToolkit.Labs.WinUI.SegmentedControl.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>SegmentedControl</ToolkitComponentName>
     <Description>This package contains SegmentedControl.</Description>
-    <Version>0.0.3</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.SegmentedControlRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/SegmentedControl/src/Dependencies.props b/components/SegmentedControl/src/Dependencies.props
@@ -11,21 +11,21 @@
 <Project>
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 2 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
-    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
-    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.230801-preview"/>
   </ItemGroup>
 </Project>
diff --git a/components/Shimmer/src/AdditionalAssemblyInfo.cs b/components/Shimmer/src/AdditionalAssemblyInfo.cs
diff --git a/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj b/components/Shimmer/src/CommunityToolkit.Labs.WinUI.Shimmer.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>Shimmer</ToolkitComponentName>
     <Description>This package contains Shimmer.</Description>
-    <Version>0.0.1</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.ShimmerRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/Shimmer/src/Dependencies.props b/components/Shimmer/src/Dependencies.props
@@ -12,24 +12,24 @@
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
     <!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="7.1.3"/> -->
-    <PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.0-beta.1" />
+    <PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
   </ItemGroup>
 
   <!-- WinUI 2 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
     <!--  <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.1.11"/> -->
-    <PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.0-beta.1" />
+    <PackageReference Include="CommunityToolkit.Uwp.Animations" Version="8.0.230801-preview" />
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
     <!-- <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2"/> -->
-    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.0-beta.1" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
   </ItemGroup>
 
   <!-- WinUI 3 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
     <!-- <PackageReference Include="Uno.CommunityToolkit.WinUI.UI" Version="7.1.100"/> -->
-    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.0-beta.1" />
+    <PackageReference Include="CommunityToolkit.WinUI.Animations" Version="8.0.230801-preview" />
   </ItemGroup>
 </Project>
diff --git a/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs b/components/StackedNotificationsBehavior/src/AdditionalAssemblyInfo.cs
diff --git a/...NotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj b/...NotificationsBehavior/src/CommunityToolkit.Labs.WinUI.StackedNotificationsBehavior.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>StackedNotificationsBehavior</ToolkitComponentName>
     <Description>This package contains StackedNotificationsBehavior.</Description>
-    <Version>0.0.2</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.StackedNotificationsBehaviorRns</RootNamespace>
   </PropertyGroup>

diff --git a/components/StackedNotificationsBehavior/src/Dependencies.props b/components/StackedNotificationsBehavior/src/Dependencies.props
@@ -11,21 +11,21 @@
 <Project>
   <!-- WinUI 2 / UWP -->
   <ItemGroup Condition="'$(IsUwp)' == 'true'">
-    <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 2 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2'">
-    <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.Uwp.Behaviors" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / WinAppSdk -->
   <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
-    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
   </ItemGroup>
 
   <!-- WinUI 3 / Uno -->
   <ItemGroup Condition="'$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3'">
-    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.0-beta.1"/>
+    <PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.0.230801-preview"/>
   </ItemGroup>
 </Project>
diff --git a/components/TokenView/src/AdditionalAssemblyInfo.cs b/components/TokenView/src/AdditionalAssemblyInfo.cs
diff --git a/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj b/components/TokenView/src/CommunityToolkit.Labs.WinUI.TokenView.csproj
@@ -2,8 +2,7 @@
   <PropertyGroup>
     <ToolkitComponentName>TokenView</ToolkitComponentName>
     <Description>This package contains TokenView.</Description>
-    <Version>0.0.6</Version>
-
+
     <!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
     <RootNamespace>CommunityToolkit.Labs.WinUI.TokenViewRns</RootNamespace>
   </PropertyGroup>