Auto set version of library packages (#116)

* Add conditions to set version if not set in the ToolkitComponent.SourceProject.props file Uses MajorVersion.MinorVersion.yyMMdd[-PreviewVersion] format * Inline dependent version numbers to not conflict with search for <Version> Remove <Version> from project template * Auto-generate our own AssemblyInfo for source projects Copied from App.Head.props * Add InternalsVisibleTo Assembly Generation to be Automated in ToolkitComponent.SourceProject.props file (with the rest of the assembly generation work) * Fix issues with version attributes for libraries * Forward defined InternalsVisibleTo properties to our Assembly Metadata Generator in ToolkitComponent.SourceProject.props * Define Major/Minor version for tooling build to work independently * Don't iterate and add a blank if there's no extra InternalsVisibleTo defined * Update Toolkit dependencies to new unified version
CommunityToolkit · Aug 1, 2023 · 02a05b9 · 02a05b9
1 parent 36c23c8
commit 02a05b9
Show file tree

Hide file tree

Showing 9 changed files with 118 additions and 29 deletions.
diff --git a/.github/workflows/config/Directory.Build.props b/.github/workflows/config/Directory.Build.props
@@ -2,6 +2,9 @@
   <PropertyGroup>
     <RepositoryDirectory>$(MSBuildThisFileDirectory)</RepositoryDirectory>
     <ToolingDirectory>$(RepositoryDirectory)\tooling</ToolingDirectory>
+
+    <MajorVersion>1</MajorVersion>
+    <MinorVersion>0</MinorVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/ProjectHeads/App.Head.props b/ProjectHeads/App.Head.props
@@ -26,7 +26,7 @@
   <Choose>
     <When Condition="'$(ToolkitConvertersSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.0.0-beta.1"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Converters" Version="8.0.230801-preview"/>
       </ItemGroup>
     </When>
     <Otherwise>

diff --git a/ProjectHeads/Head.Uwp.props b/ProjectHeads/Head.Uwp.props
@@ -127,9 +127,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-            <Version>6.2.12</Version>
-        </PackageReference>
+        <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.12"/>
         <PackageReference Include="PolySharp" Version="1.13.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/ProjectHeads/Tests.Head.WinAppSdk.props b/ProjectHeads/Tests.Head.WinAppSdk.props
@@ -6,8 +6,7 @@
   <Import Project="$(MSBuildThisFileDirectory)\Head.WinAppSdk.props"/>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform.TestHost">
-      <Version>17.1.0</Version>
+    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="17.1.0">
       <ExcludeAssets>build</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/ProjectHeads/Tests.Head.props b/ProjectHeads/Tests.Head.props
@@ -7,21 +7,16 @@
 
   <!-- Test Dependencies -->
   <ItemGroup>
-    <PackageReference Include="MSTest.TestAdapter">
-      <Version>2.2.10</Version>
-    </PackageReference>
-
-    <PackageReference Include="MSTest.TestFramework">
-      <Version>2.2.10</Version>
-    </PackageReference>
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10"/>
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10"/>
 
     <ProjectReference Include="$(ToolingDirectory)\CommunityToolkit.Tooling.TestGen\CommunityToolkit.Tooling.TestGen.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="True" />
   </ItemGroup>
 
   <Choose>
     <When Condition="'$(ToolkitExtensionSourceProject)' == ''">
       <ItemGroup>
-        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.0-beta.2"/>
+        <PackageReference Include="CommunityToolkit.$(DependencyVariant).Extensions" Version="8.0.230801-preview"/>
       </ItemGroup>
     </When>
     <Otherwise>

diff --git 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 `<Version>` 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
diff --git a/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj b/ProjectTemplate/src/CommunityToolkit.WinUI.Controls.ProjectTemplate.csproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ToolkitComponentName>ProjectTemplate</ToolkitComponentName>
     <Description>This package contains ProjectTemplate.</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.WinUI.Controls.ProjectTemplateRns</RootNamespace>

diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
@@ -7,6 +7,114 @@
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
   <PropertyGroup>
+    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$([System.DateTime]::UtcNow.ToString(yyMMdd))</Version>
+    <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
     <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>
+
+  <!-- Auto Generate our own Assembly Info -->
+    <PropertyGroup>
+    <!-- Turn-off .NET based AssemblyInfo.cs generator, see below -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <!-- https://stackoverflow.com/questions/10980249/msbuild-task-for-setting-custom-attribute-in-assemblyinfo-cs -->
+  <!-- https://gist.github.com/KirillOsenkov/f20cb84d37a89b01db63f8aafe03f19b -->
+  <Target Name="AddAssemblyAttributes" BeforeTargets="BeforeCompile">
+    <PropertyGroup>
+      <GeneratedAssemblyInfoPath>$(IntermediateOutputPath)AssemblyInfo.g.cs</GeneratedAssemblyInfoPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <!-- Add our own AssemblyInfo.cs standard attributes -->
+      <AssemblyAttributes Include="AssemblyTitle">
+        <_Parameter1>$(PackageId)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyDescription">
+        <_Parameter1>$(Description)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyCompany">
+        <_Parameter1>$(Company)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyProduct">
+        <_Parameter1>$(Product)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyCopyright">
+        <_Parameter1>$(Copyright)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyTrademark">
+        <_Parameter1></_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyCulture">
+        <_Parameter1></_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyConfiguration">
+        <_Parameter1>$(Configuration)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyVersion">
+        <!-- This should remain as Major.Minor as Assembly Version shouldn't change across small revisions -->
+        <_Parameter1>$(MajorVersion).$(MinorVersion).0.0</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyFileVersion">
+        <!-- TODO: We should include some build number in here to make it more unique, can't use same date as too large -->
+        <_Parameter1>$(MajorVersion).$(MinorVersion).0.0</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="AssemblyInformationalVersion">
+        <_Parameter1>$(Version)</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Runtime.InteropServices.ComVisible">
+        <_Parameter1>false</_Parameter1>
+        <_Parameter1_TypeName>System.Boolean</_Parameter1_TypeName>
+      </AssemblyAttributes>
+
+      <!-- Add custom attributes, also see https://stackoverflow.com/questions/56835671/how-to-read-a-msbuild-property-in-a-given-project-in-runtime -->
+      <AssemblyAttributes Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(SourceRevisionId)' != ''">
+        <_Parameter1>CommitHash</_Parameter1>
+        <_Parameter2>$(SourceRevisionId)</_Parameter2>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(PackageProjectUrl)' != ''">
+        <_Parameter1>RepositoryUrl</_Parameter1>
+        <_Parameter2>$(PackageProjectUrl)</_Parameter2>
+      </AssemblyAttributes>
+      <Warning Text="The PackageProjectUrl property was not set." Condition="'$(PackageProjectUrl)' == ''" />
+
+      <!-- Add InternalsVisibleTo for tests -->
+      <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>$(ToolkitComponentName).Tests.Uwp</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>$(ToolkitComponentName).Tests.WinAppSdk</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>CommunityToolkit.Tests.Uwp</_Parameter1>
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>CommunityToolkit.Tests.WinAppSdk</_Parameter1>
+      </AssemblyAttributes>
+    </ItemGroup>
+
+    <ItemGroup Condition="'@(InternalsVisibleTo)' != ''">
+      <!-- Add any declared InternalsVisibleTo in source project, if any-->
+      <AssemblyAttributes Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>%(InternalsVisibleTo.Identity)</_Parameter1>
+      </AssemblyAttributes>
+    </ItemGroup>
+
+    <!-- Extra attributes specific to platforms -->
+    <ItemGroup Condition="'$(IsWinAppSdk)' == 'true'">
+      <AssemblyAttributes Include="System.Runtime.Versioning.TargetPlatformAttribute">
+        <_Parameter1>Windows10.0.19041.0</_Parameter1>        <!-- TODO: Grab from variable -->
+      </AssemblyAttributes>
+      <AssemblyAttributes Include="System.Runtime.Versioning.SupportedOSPlatformAttribute">
+        <_Parameter1>Windows10.0.17763.0</_Parameter1>        <!-- TODO: Grab from variable -->
+      </AssemblyAttributes>
+    </ItemGroup>
+
+    <ItemGroup>
+      <Compile Include="$(GeneratedAssemblyInfoPath)" />
+    </ItemGroup>
+
+    <!-- Write out new auto-generated AssemblyInfo.g.cs file -->
+    <WriteCodeFragment Language="C#" OutputFile="$(GeneratedAssemblyInfoPath)" AssemblyAttributes="@(AssemblyAttributes)" />
+  </Target>
 </Project>