Husky/DaSaSo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git version wird richtig geparsed

Browse Source
This commit is contained in:
HuskyTeufel
2022-03-30 15:16:36 +02:00
parent 06cb2572ff
commit ecda2ab44f
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -18,3 +18,4 @@ project.fragment.lock.json
*.tmp *.tmp
/DaSaSo.InMemoryProvider/obj/Debug/* /DaSaSo.InMemoryProvider/obj/Debug/*
/DaSaSo.ViewModel/version.txt /DaSaSo.ViewModel/version.txt
/DaSaSo.Wpf/version.txt

14
DaSaSo.Wpf/DaSaSo.Wpf.csproj
View File

@@ -7,6 +7,16 @@
<UseWPF>true</UseWPF> <UseWPF>true</UseWPF>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<None Remove="version.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="version.txt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</EmbeddedResource>
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
@@ -28,4 +38,8 @@
</None> </None>
</ItemGroup> </ItemGroup>
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
<Exec Command="git rev-parse HEAD &gt; $(ProjectDir)\version.txt" />
</Target>
</Project> </Project>

2
DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs
View File

@@ -103,7 +103,7 @@ namespace DaSaSo.Wpf.ViewModel
{ {
string gitVersion; string gitVersion;
#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. #pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type.
using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("DaSaSo.ViewModel.version.txt")) using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("DaSaSo.Wpf.version.txt"))
#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. #pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type.
#pragma warning disable CS8604 // Possible null reference argument. #pragma warning disable CS8604 // Possible null reference argument.
using (StreamReader reader = new(stream)) using (StreamReader reader = new(stream))