chg - Finalized the D.B.props file

--- Type: chg Breaking: False Doc Required: False Part: 1/1
Aptivi-Archives · Apr 27, 2024 · 49087fb · 49087fb
1 parent 6b92dcd
commit 49087fb
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 46 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,23 @@
+<Project>
+    <PropertyGroup>
+        <Version>1.3.0</Version>
+        <Authors>Aptivi</Authors>
+        <Product>GRILO</Product>
+        <Company>Aptivi</Company>
+        <Copyright>Copyright (c) 2022-2024 Aptivi</Copyright>
+        <LangVersion>latest</LangVersion>
+        <DebugType>portable</DebugType>
+        <SignAssembly>True</SignAssembly>
+        <RootPath>$(MSBuildThisFileDirectory)</RootPath>
+        <AssemblyOriginatorKeyFile>$(RootPath)\aptivi_snk.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    </ItemGroup>
+</Project>
diff --git a/GRILO.Boot/GRILO.Boot.csproj b/GRILO.Boot/GRILO.Boot.csproj
@@ -7,11 +7,7 @@
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <Version>0.1.0.4</Version>
-    <PackageVersion>0.1.0.4</PackageVersion>
-    <Authors>Aptivi</Authors>
-    <Product>GRILO</Product>
     <Description>Bootloader simulator for .NET</Description>
-    <Copyright>Copyright (c) 2022 Aptivi</Copyright>
     <PackageProjectUrl>https://github.com/Aptivi/GRILO</PackageProjectUrl>
     <PackageIcon>OfficialAppIcon-GRILO-512.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -20,8 +16,6 @@
     <PackageTags>bootloader;boot;csharp;dotnet</PackageTags>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\aptivi_snk.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,13 +32,4 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
diff --git a/GRILO.BootableAppDemo/GRILO.BootableAppDemo.csproj b/GRILO.BootableAppDemo/GRILO.BootableAppDemo.csproj
@@ -3,12 +3,12 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net8.0;net48</TargetFrameworks>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\aptivi_snk.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\GRILO.Boot\GRILO.Boot.csproj" />
+
+    <PackageReference Remove="Microsoft.SourceLink.GitHub" />
   </ItemGroup>
 
   <ItemGroup>
@@ -17,13 +17,4 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
diff --git a/GRILO.Bootloader/GRILO.Bootloader.csproj b/GRILO.Bootloader/GRILO.Bootloader.csproj
@@ -8,12 +8,7 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Version>1.3.0</Version>
-    <PackageVersion>1.3.0</PackageVersion>
-    <Authors>Aptivi</Authors>
-    <Product>GRILO</Product>
     <Description>Bootloader simulator for .NET</Description>
-    <Copyright>Copyright (c) 2022 Aptivi</Copyright>
     <PackageProjectUrl>https://github.com/Aptivi/GRILO</PackageProjectUrl>
     <PackageIcon>OfficialAppIcon-GRILO-512.png</PackageIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -22,9 +17,6 @@
     <PackageTags>bootloader;boot;csharp;dotnet</PackageTags>
     <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-    <LangVersion>latest</LangVersion>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\aptivi_snk.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -56,13 +48,4 @@
     <ProjectReference Include="..\GRILO.Boot\GRILO.Boot.csproj" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
 </Project>
diff --git a/tools/docgen-pack.cmd b/tools/docgen-pack.cmd
@@ -1,7 +1,8 @@
 @echo off
 
 REM This script builds KS documentation and packs the artifacts. Use when you have VS installed.
-for /f "tokens=* USEBACKQ" %%f in (`type version`) do set ksversion=%%f
+for /f "tokens=*" %%g in ('findstr "<Version>" ..\Directory.Build.props') do (set MIDVER=%%g)
+for /f "tokens=1 delims=<" %%a in ("%MIDVER:~9%") do (set ksversion=%%a)
 
 :pack
 echo Packing documentation...

diff --git a/tools/docgen-pack.sh b/tools/docgen-pack.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # This script builds KS and packs the artifacts. Use when you have MSBuild installed.
-ksversion=$(cat version)
+ksversion=$(grep "<Version>" ../Directory.Build.props | cut -d "<" -f 2 | cut -d ">" -f 2)
 
 # Check for dependencies
 zippath=`which zip`

diff --git a/tools/version b/tools/version