minver and build adjust

kfrancis · May 27, 2024 · a474db7 · a474db7
1 parent ef2ab9e
commit a474db7
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -58,21 +58,31 @@ jobs:
       if: contains(matrix.project, 'Plugin.Maui.OCR')
       run: dotnet workload install maui-android maui-ios maui-maccatalyst
 
+    - name: Determine Version
+      id: minver
+      run: |
+        dotnet tool install --global minver-cli
+        minver > version.txt
+        $version = Get-Content version.txt
+        echo "##vso[task.setvariable variable=PACKAGE_VERSION]$version"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Restore NuGet packages for Xamarin
       if: contains(matrix.project, 'Plugin.Xamarin.OCR')
       run: msbuild /t:Restore ${{ matrix.project }} -maxcpucount
 
     - name: Build Xamarin
       if: contains(matrix.project, 'Plugin.Xamarin.OCR')
-      run: msbuild /m /t:Build ${{ matrix.project }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:GeneratePackageOnBuild=true /p:OutputPath=${{ env.NuGetDirectory }} /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:RestorePackages=false -maxcpucount
+      run: msbuild /m /t:Build ${{ matrix.project }} /p:Configuration=${{ env.BUILD_CONFIGURATION }} /p:GeneratePackageOnBuild=true /p:PackageVersion=${{ env.PACKAGE_VERSION }} /p:OutputPath=${{ env.NuGetDirectory }} /p:IncludeSymbols=true /p:SymbolPackageFormat=snupkg /p:RestorePackages=false -maxcpucount
 
     - name: Build MAUI
       if: contains(matrix.project, 'Plugin.Maui.OCR')
-      run: dotnet build ${{ matrix.project }} -c ${{ env.BUILD_CONFIGURATION }}
+      run: dotnet build ${{ matrix.project }} -c ${{ env.BUILD_CONFIGURATION }} -p:Version=${{ env.PACKAGE_VERSION }}
 
     - name: Pack MAUI NuGet Package
       if: contains(matrix.project, 'Plugin.Maui.OCR')
-      run: dotnet pack ${{ matrix.project }} --configuration ${{ env.BUILD_CONFIGURATION }} --output ${{ env.NuGetDirectory }} -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg
+      run: dotnet pack ${{ matrix.project }} --configuration ${{ env.BUILD_CONFIGURATION }} --output ${{ env.NuGetDirectory }} -p:IncludeSymbols=true -p:SymbolPackageFormat=snupkg -p:Version=${{ env.PACKAGE_VERSION }}
 
     # Step to prepare the artifacts by copying *.nupkg and *.snpkg files to a temporary directory
     - name: Prepare Artifacts

diff --git a/Directory.build.props b/Directory.build.props
@@ -1,52 +1,46 @@
 <Project>
-  <PropertyGroup>
-  <IsPackageProject Condition="!$([System.String]::new('$(MSBuildProjectName)').Contains('Sample'))">true</IsPackageProject>
-  <IsPackageProject Condition="$([System.String]::new('$(MSBuildProjectName)').Contains('Sample'))">false</IsPackageProject>
-</PropertyGroup>
-  <PropertyGroup Condition=" $(IsPackageProject) ">
-    <Copyright>Copyright (c) Kori Francis</Copyright> 
-    <Authors>Kori Francis</Authors>
-    <Owners>Kori Francis</Owners>
-
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <RepositoryUrl>https://github.com/kfrancis/ocr</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <NeutralLanguage>en</NeutralLanguage>
-
-    <Platform>AnyCPU</Platform>
-    <Product>$(AssemblyName) ($(TargetFramework))</Product>
-
-    <NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
-
-    <!-- Sourcelink -->
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-
-    <PackageProjectUrl>https://github.com/kfrancis/ocr</PackageProjectUrl>
-    <PackageIcon>icon.png</PackageIcon>
-
-    <PackageDescription>Plugin which provides the ability to perform OCR on an image using platform API.</PackageDescription>
-    <Deterministic>true</Deterministic>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" $(IsPackageProject) ">
-    <None Include="..\..\nuget.png" Pack="true" PackagePath="icon.png"/>
-  </ItemGroup>
+	<PropertyGroup>
+		<IsPackageProject Condition="!$([System.String]::new('$(MSBuildProjectName)').Contains('Sample'))">true</IsPackageProject>
+		<IsPackageProject Condition="$([System.String]::new('$(MSBuildProjectName)').Contains('Sample'))">false</IsPackageProject>
+        <MinVerAutoIncrement>minor</MinVerAutoIncrement>
+        <MinVerBuildMetadata>build</MinVerBuildMetadata>
+        <MinVerTagPrefix>v</MinVerTagPrefix>
+        <MinVerVerbosity>normal</MinVerVerbosity>
+	</PropertyGroup>
+	<PropertyGroup Condition=" $(IsPackageProject) ">
+		<Copyright>Copyright (c) Kori Francis</Copyright>
+		<Authors>Kori Francis</Authors>
+		<Owners>Kori Francis</Owners>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<RepositoryUrl>https://github.com/kfrancis/ocr</RepositoryUrl>
+		<RepositoryType>git</RepositoryType>
+		<NeutralLanguage>en</NeutralLanguage>
+		<Platform>AnyCPU</Platform>
+		<Product>$(AssemblyName) ($(TargetFramework))</Product>
+		<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>
+		<!-- Sourcelink -->
+		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+		<PackageProjectUrl>https://github.com/kfrancis/ocr</PackageProjectUrl>
+		<PackageIcon>icon.png</PackageIcon>
+		<PackageDescription>Plugin which provides the ability to perform OCR on an image using platform API.</PackageDescription>
+		<Deterministic>true</Deterministic>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>portable</DebugType>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+		<DebugType>portable</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+	</PropertyGroup>
+	<ItemGroup Condition=" $(IsPackageProject) ">
+		<None Include="..\..\nuget.png" Pack="true" PackagePath="icon.png"/>
+	</ItemGroup>
 </Project>
diff --git a/samples/Plugin.Maui.OCR.Sample.sln b/samples/Plugin.Maui.OCR.Sample.sln
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\.editorconfig = ..\.editorconfig
 		..\.gitattributes = ..\.gitattributes
 		..\.gitignore = ..\.gitignore
-		..\.github\workflows\ci-sample.yml = ..\.github\workflows\ci-sample.yml
 		..\.github\workflows\ci.yml = ..\.github\workflows\ci.yml
 		..\Directory.build.props = ..\Directory.build.props
 		..\Directory.build.targets = ..\Directory.build.targets

diff --git a/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj b/src/Plugin.Maui.OCR/Plugin.Maui.OCR.csproj
@@ -105,6 +105,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
     <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+    <PackageReference Include="MinVer" Version="5.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Management" Version="8.0.0" Condition="$(TargetFramework.Contains('-windows')) == true" />
     <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>