From c7118a8c98078c7bd5e67b5f6cae98e98f9f364e Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 13:01:44 -0700
Subject: [PATCH 1/9] Add conditions to set version if not set in the
ToolkitComponent.SourceProject.props file
Uses MajorVersion.MinorVersion.yyMMdd[-PreviewVersion] format
---
ToolkitComponent.SourceProject.props | 2 ++
1 file changed, 2 insertions(+)
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index ad973b4c..4ea4962f 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -7,6 +7,8 @@
+ $(MajorVersion).$(MinorVersion).$([System.DateTime]::UtcNow.ToString(yyMMdd))
+ $(Version)-$(PreviewVersion)
$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)
From ec70cdfff37c8ac49663068f0064387e4b19613a Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 13:04:58 -0700
Subject: [PATCH 2/9] Inline dependent version numbers to not conflict with
search for
Remove from project template
---
ProjectHeads/Head.Uwp.props | 4 +---
ProjectHeads/Tests.Head.WinAppSdk.props | 3 +--
ProjectHeads/Tests.Head.props | 9 ++-------
ProjectTemplate/README.md | 2 +-
...ommunityToolkit.WinUI.Controls.ProjectTemplate.csproj | 1 -
5 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/ProjectHeads/Head.Uwp.props b/ProjectHeads/Head.Uwp.props
index c5a8ab21..e2000b4a 100644
--- a/ProjectHeads/Head.Uwp.props
+++ b/ProjectHeads/Head.Uwp.props
@@ -127,9 +127,7 @@
-
- 6.2.12
-
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/ProjectHeads/Tests.Head.WinAppSdk.props b/ProjectHeads/Tests.Head.WinAppSdk.props
index 7c184c13..7260103d 100644
--- a/ProjectHeads/Tests.Head.WinAppSdk.props
+++ b/ProjectHeads/Tests.Head.WinAppSdk.props
@@ -6,8 +6,7 @@
-
- 17.1.0
+
build
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
index 5e86a3db..efec80a0 100644
--- a/ProjectHeads/Tests.Head.props
+++ b/ProjectHeads/Tests.Head.props
@@ -7,13 +7,8 @@
-
- 2.2.10
-
-
-
- 2.2.10
-
+
+
diff --git a/ProjectTemplate/README.md b/ProjectTemplate/README.md
index 1edef32d..6b1d8401 100644
--- a/ProjectTemplate/README.md
+++ b/ProjectTemplate/README.md
@@ -64,7 +64,7 @@ This may require a reboot.
#### Updating NuGet Package
-Packages are manually versioned right now, [see this issue here](https://github.com/CommunityToolkit/Labs-Windows/issues/133). In order to update your NuGet package, update the `` tag in your library's `CommunityToolkit.WinUI.Controls.MyExperimentNameHere.csproj` file.
+Packages are automatically versioned right now by day. The first commit of the day will push a new package with that date stamp.
#### WebAssembly Sample Project
diff --git a/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj b/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
index 17d47aec..33aac3b8 100644
--- a/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
+++ b/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@@ -2,7 +2,6 @@
ProjectTemplate
This package contains ProjectTemplate.
- 0.0.1
CommunityToolkit.WinUI.Controls.ProjectTemplateRns
From 5ddf4bf74835fbcc80d7ae11106a9119999b969c Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:22:05 -0700
Subject: [PATCH 3/9] Auto-generate our own AssemblyInfo for source projects
Copied from App.Head.props
---
ToolkitComponent.SourceProject.props | 82 ++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 4ea4962f..2bd6f2ce 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -11,4 +11,86 @@
$(Version)-$(PreviewVersion)
$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)
+
+
+
+
+ false
+
+
+
+
+
+
+ $(IntermediateOutputPath)AssemblyInfo.g.cs
+
+
+
+
+
+ <_Parameter1>$(PackageId)
+
+
+ <_Parameter1>$(Description)
+
+
+ <_Parameter1>$(Company)
+
+
+ <_Parameter1>$(Product)
+
+
+ <_Parameter1>$(Copyright)
+
+
+ <_Parameter1>
+
+
+ <_Parameter1>
+
+
+ <_Parameter1>$(Configuration)
+
+
+ <_Parameter1>$(MajorVersion).$(MinorVersion).0.0
+
+
+ <_Parameter1>$([System.Text.RegularExpressions.Regex]::Match($(Version), "\d+\.\d+\.\d+").Value).0
+
+
+ <_Parameter1>$(Version)
+
+
+ <_Parameter1>false
+ <_Parameter1_TypeName>System.Boolean
+
+
+
+
+ <_Parameter1>CommitHash
+ <_Parameter2>$(SourceRevisionId)
+
+
+ <_Parameter1>$(PackageProjectUrl)
+
+
+
+
+
+
+
+ <_Parameter1>Windows10.0.19041.0
+
+
+ <_Parameter1>Windows10.0.17763.0
+
+
+
+
+
+
+
+
+
+
From 185b57dc83740f529e63ece48576a66c923fa321 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:30:18 -0700
Subject: [PATCH 4/9] Add InternalsVisibleTo Assembly Generation to be
Automated in ToolkitComponent.SourceProject.props file
(with the rest of the assembly generation work)
---
ProjectTemplate/src/AdditionalAssemblyInfo.cs | 13 -------------
ToolkitComponent.SourceProject.props | 14 ++++++++++++++
2 files changed, 14 insertions(+), 13 deletions(-)
delete mode 100644 ProjectTemplate/src/AdditionalAssemblyInfo.cs
diff --git a/ProjectTemplate/src/AdditionalAssemblyInfo.cs b/ProjectTemplate/src/AdditionalAssemblyInfo.cs
deleted file mode 100644
index 9a34348d..00000000
--- a/ProjectTemplate/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("ProjectTemplate.Tests.Uwp")]
-[assembly: InternalsVisibleTo("ProjectTemplate.Tests.WinAppSdk")]
-[assembly: InternalsVisibleTo("CommunityToolkit.Tests.Uwp")]
-[assembly: InternalsVisibleTo("CommunityToolkit.Tests.WinAppSdk")]
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 2bd6f2ce..448fb9db 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -74,6 +74,20 @@
<_Parameter1>$(PackageProjectUrl)
+
+
+
+ <_Parameter1>$(ToolkitComponentName).Tests.Uwp
+
+
+ <_Parameter1>$(ToolkitComponentName).Tests.WinAppSdk
+
+
+ <_Parameter1>CommunityToolkit.Tests.Uwp
+
+
+ <_Parameter1>CommunityToolkit.Tests.WinAppSdk
+
From 4b02ae7c8827152d3be05de5834fafa7849b67e8 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:54:11 -0700
Subject: [PATCH 5/9] Fix issues with version attributes for libraries
---
ToolkitComponent.SourceProject.props | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 448fb9db..710390bb 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -52,10 +52,12 @@
<_Parameter1>$(Configuration)
+
<_Parameter1>$(MajorVersion).$(MinorVersion).0.0
- <_Parameter1>$([System.Text.RegularExpressions.Regex]::Match($(Version), "\d+\.\d+\.\d+").Value).0
+
+ <_Parameter1>$(MajorVersion).$(MinorVersion).0.0
<_Parameter1>$(Version)
@@ -70,8 +72,9 @@
<_Parameter1>CommitHash
<_Parameter2>$(SourceRevisionId)
-
- <_Parameter1>$(PackageProjectUrl)
+
+ <_Parameter1>RepositoryUrl
+ <_Parameter2>$(PackageProjectUrl)
From 3f0fb7861e0f351172d8f8fd0845c1d6e282ae82 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 16:49:30 -0700
Subject: [PATCH 6/9] Forward defined InternalsVisibleTo properties to our
Assembly Metadata Generator in ToolkitComponent.SourceProject.props
---
ToolkitComponent.SourceProject.props | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 710390bb..6451f3dc 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -91,6 +91,11 @@
<_Parameter1>CommunityToolkit.Tests.WinAppSdk
+
+
+
+ <_Parameter1>%(InternalsVisibleTo.Identity)
+
From 8082df26a795da42f135fa74e85615857ae17f04 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 16:49:47 -0700
Subject: [PATCH 7/9] Define Major/Minor version for tooling build to work
independently
---
.github/workflows/config/Directory.Build.props | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.github/workflows/config/Directory.Build.props b/.github/workflows/config/Directory.Build.props
index 7dfbce77..d79bc25d 100644
--- a/.github/workflows/config/Directory.Build.props
+++ b/.github/workflows/config/Directory.Build.props
@@ -2,6 +2,9 @@
$(MSBuildThisFileDirectory)
$(RepositoryDirectory)\tooling
+
+ 1
+ 0
From bc519fe2e008037ac9c844be452d84356dcce213 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:39:36 -0700
Subject: [PATCH 8/9] Don't iterate and add a blank if there's no extra
InternalsVisibleTo defined
---
ToolkitComponent.SourceProject.props | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 6451f3dc..3c9ea580 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -91,8 +91,10 @@
<_Parameter1>CommunityToolkit.Tests.WinAppSdk
+
-
+
+
<_Parameter1>%(InternalsVisibleTo.Identity)
From 82e852b946f8caec930bd451c76be520f19b408c Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Tue, 1 Aug 2023 10:49:24 -0700
Subject: [PATCH 9/9] Update Toolkit dependencies to new unified version
---
ProjectHeads/App.Head.props | 2 +-
ProjectHeads/Tests.Head.props | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
index af5b586f..bae49c29 100644
--- a/ProjectHeads/App.Head.props
+++ b/ProjectHeads/App.Head.props
@@ -26,7 +26,7 @@
-
+
diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
index efec80a0..6d40f460 100644
--- a/ProjectHeads/Tests.Head.props
+++ b/ProjectHeads/Tests.Head.props
@@ -16,7 +16,7 @@
-
+