Skip to content

Commit

Permalink
Hand set version
Browse files Browse the repository at this point in the history
GitInfo is nice, but doesn't work with the dual solution setup here
  • Loading branch information
Noggog committed Oct 3, 2023
1 parent effb6bc commit 7458939
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 34 deletions.
26 changes: 1 addition & 25 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,19 @@

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<GitVersion>false</GitVersion>
<Nullable>enable</Nullable>
<LangVersion>preview</LangVersion>
<ImplicitUsings>true</ImplicitUsings>
<WarningsAsErrors>nullable</WarningsAsErrors>
<Version>1.3.0</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitInfo" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
<PackageReference Include="NuGetizer" >
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<!-- To be redefined by GitInfo after restore. -->
<Target Name="GitVersion" />

<Target Name="SetVersion"
BeforeTargets="GetAssemblyVersion;GetPackageVersion;GetAssemblyVersion;GenerateNuspec;GetPackageContents"
DependsOnTargets="GitVersion"
Returns="$(PackageVersion)">
<PropertyGroup>
<DevLabel Condition="$(GitCommits) != '0' And $(VersionSuffix) == ''">.1-zdev</DevLabel>
<DevLabel Condition="$(GitCommits) != '0' And $(VersionSuffix) != ''">.1-$(VersionSuffix)</DevLabel>
<AssemblyDevLabel Condition="$(GitCommits) != '0'">.1</AssemblyDevLabel>
<AssemblyVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(AssemblyDevLabel)</AssemblyVersion>
<FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(AssemblyDevLabel)</FileVersion>
<PackageVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(DevLabel)</PackageVersion>
<InformationalVersion>$(PackageVersion)</InformationalVersion>
</PropertyGroup>
</Target>
</Project>
13 changes: 4 additions & 9 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<Project>
<ItemGroup>
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="GitInfo">
<Version>3.0.4</Version>
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Loqui">
<Version>[2.60.0.1-nightly-20230920-202693]</Version>
</PackageVersion>
Expand Down Expand Up @@ -36,10 +31,10 @@
<PackageVersion Include="Mutagen.Bethesda.Testing">
<Version>[0.43.0.1-nightly-20231003-100733]</Version>
</PackageVersion>
<PackageVersion Include="Mutagen.Bethesda.Serialization" Version="1.2" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.Newtonsoft" Version="1.2" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.SourceGenerator" Version="1.2" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.Yaml" Version="1.2" />
<PackageVersion Include="Mutagen.Bethesda.Serialization" Version="$(Version)" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.Newtonsoft" Version="$(Version)" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.SourceGenerator" Version="$(Version)" />
<PackageVersion Include="Mutagen.Bethesda.Serialization.Yaml" Version="$(Version)" />
<PackageVersion Include="Newtonsoft.Json">
<Version>13.0.3</Version>
</PackageVersion>
Expand Down

0 comments on commit 7458939

Please sign in to comment.