Skip to content

Commit

Permalink
Updating Versioning and MinVer package (#518)
Browse files Browse the repository at this point in the history
  • Loading branch information
tehcrashxor authored Jan 25, 2024
1 parent 69a7ac1 commit 0f3fa61
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</ItemGroup>

<ItemGroup Condition="'$(GitExists)' == true">
<PackageReference Include="MinVer" Version="2.3.0">
<PackageReference Include="MinVer" Version="$(MinVerVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand All @@ -49,6 +49,10 @@
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVer)</AssemblyVersion>
<FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
<InformationalVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)$(MinVerBuildMetadata)</InformationalVersion>
<PackageVersion>$(MinVerVersion)</PackageVersion>
<PackageVersion Condition=" '$(Configuration)' == 'Debug' ">$(PackageVersion)-Debug</PackageVersion>
</PropertyGroup>
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
"version": 1,
"dependencies": {
"net7.0": {
"MinVer": {
"type": "Direct",
"requested": "[4.3.0, )",
"resolved": "4.3.0",
"contentHash": "YNVAW3loCFW4kTwensApaZUl+7xREK75QQNOFSbsbXx2sCSm9/IHBjUHsJGn3u0UA5r/sAqrdYBNUlOFfLhUrA=="
},
"YamlDotNet": {
"type": "Direct",
"requested": "[15.1.0, )",
Expand Down
6 changes: 5 additions & 1 deletion src/PAModel/Microsoft.PowerPlatform.Formulas.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
<PropertyGroup>
<AssemblyVersion>$(MinVer)</AssemblyVersion>
<FileVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</FileVersion>
<InformationalVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch)-$(MinVerPreRelease)$(MinVerBuildMetadata)</InformationalVersion>
<PackageVersion>$(MinVerVersion)</PackageVersion>
<PackageVersion Condition=" '$(Configuration)' == 'Debug' ">$(PackageVersion)-Debug</PackageVersion>
</PropertyGroup>
</Target>

Expand All @@ -59,7 +63,7 @@
</ItemGroup>

<ItemGroup Condition="'$(GitExists)' == true">
<PackageReference Include="MinVer" Version="2.3.0">
<PackageReference Include="MinVer" Version="$(MinVerVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 6 additions & 0 deletions src/PAModel/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
"System.Diagnostics.DiagnosticSource": "6.0.0"
}
},
"MinVer": {
"type": "Direct",
"requested": "[4.3.0, )",
"resolved": "4.3.0",
"contentHash": "YNVAW3loCFW4kTwensApaZUl+7xREK75QQNOFSbsbXx2sCSm9/IHBjUHsJGn3u0UA5r/sAqrdYBNUlOFfLhUrA=="
},
"Newtonsoft.Json": {
"type": "Direct",
"requested": "[13.0.1, )",
Expand Down
1 change: 1 addition & 0 deletions src/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
<MSTestTestFrameworkVersion>2.2.10</MSTestTestFrameworkVersion>
<CoverletCollectorVersion>3.2.0</CoverletCollectorVersion>
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
<MinVerVersion>4.3.0</MinVerVersion>
</PropertyGroup>
</Project>

0 comments on commit 0f3fa61

Please sign in to comment.