From ecda2ab44f732fdcd699bd2b0b1c28615272fe55 Mon Sep 17 00:00:00 2001 From: HuskyTeufel Date: Wed, 30 Mar 2022 15:16:36 +0200 Subject: [PATCH] Git version wird richtig geparsed --- .gitignore | 1 + DaSaSo.Wpf/DaSaSo.Wpf.csproj | 14 ++++++++++++++ DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index fc4e5bc..131987a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ project.fragment.lock.json *.tmp /DaSaSo.InMemoryProvider/obj/Debug/* /DaSaSo.ViewModel/version.txt +/DaSaSo.Wpf/version.txt diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj b/DaSaSo.Wpf/DaSaSo.Wpf.csproj index 3cc7ad3..4e14e91 100644 --- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj +++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj @@ -7,6 +7,16 @@ true + + + + + + + Always + + + all @@ -28,4 +38,8 @@ + + + + diff --git a/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs b/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs index 386e842..c4b74a3 100644 --- a/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs +++ b/DaSaSo.Wpf/ViewModel/Window/MainWindowViewModel.cs @@ -103,7 +103,7 @@ namespace DaSaSo.Wpf.ViewModel { string gitVersion; #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 disable CS8604 // Possible null reference argument. using (StreamReader reader = new(stream))