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 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/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..6d40f460 100644 --- a/ProjectHeads/Tests.Head.props +++ b/ProjectHeads/Tests.Head.props @@ -7,13 +7,8 @@ - - 2.2.10 - - - - 2.2.10 - + + @@ -21,7 +16,7 @@ - + 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/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/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 diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props index ad973b4c..3c9ea580 100644 --- a/ToolkitComponent.SourceProject.props +++ b/ToolkitComponent.SourceProject.props @@ -7,6 +7,114 @@ + $(MajorVersion).$(MinorVersion).$([System.DateTime]::UtcNow.ToString(yyMMdd)) + $(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>$(MajorVersion).$(MinorVersion).0.0 + + + <_Parameter1>$(Version) + + + <_Parameter1>false + <_Parameter1_TypeName>System.Boolean + + + + + <_Parameter1>CommitHash + <_Parameter2>$(SourceRevisionId) + + + <_Parameter1>RepositoryUrl + <_Parameter2>$(PackageProjectUrl) + + + + + + <_Parameter1>$(ToolkitComponentName).Tests.Uwp + + + <_Parameter1>$(ToolkitComponentName).Tests.WinAppSdk + + + <_Parameter1>CommunityToolkit.Tests.Uwp + + + <_Parameter1>CommunityToolkit.Tests.WinAppSdk + + + + + + + <_Parameter1>%(InternalsVisibleTo.Identity) + + + + + + + <_Parameter1>Windows10.0.19041.0 + + + <_Parameter1>Windows10.0.17763.0 + + + + + + + + + +