Merge pull request #5 from dojo90/4-add-netcoreapp-3.1

4 add netcoreapp 3.1
djonasdev · Feb 3, 2020 · 7b8bcad · 7b8bcad
2 parents 2e1a9b0 + 272c371
commit 7b8bcad
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/createBranch.ps1 b/createBranch.ps1
@@ -1,12 +1,31 @@
 param([string]$IssueName)
 
-$branchName = $IssueName.ToLower().Replace('/', '-').Replace(' ', '-')
+$branchName = $IssueName
+
+###########################################################
+# clean input string                                      #
+###########################################################
+
+# character replacement
+$rWhiteSpace = [regex]'[ ]{1,}'
+$rSlash = [regex]'[/]{1,}'
+$rBackSlash = [regex]'[\\]{1,}'
+$rSeperator = [regex]'[-]{2,}'
+
+$branchName = $rWhiteSpace.Replace($branchName, "-")
+$branchName = $rSlash.Replace($branchName, "-")
+$branchName = $rBackSlash.Replace($branchName, "-")
+$branchName = $rSeperator.Replace($branchName, "-")
+$branchName = $branchName.Trim('-')
+
+# limit bracnhname to 40 characters length
 $branchName = $branchName.Substring('0', '40')
 
 echo "New branch '$branchName' created"
 
 git checkout -b $branchName
 git add .
 git add -u
+
 #git commit -m "Description of my changes for issue $IssueName"
 #git push -u origin $branchName
diff --git a/src/NLogViewer.TestApp/MainWindow.xaml b/src/NLogViewer.TestApp/MainWindow.xaml
@@ -4,8 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:dj="clr-namespace:DJ;assembly=NLogViewer"
-        mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
+        mc:Ignorable="d" Height="450" Width="800">
     <Grid>
         <dj:NLogViewer MaxCount="1000"/>
     </Grid>

diff --git a/src/NLogViewer.TestApp/MainWindow.xaml.cs b/src/NLogViewer.TestApp/MainWindow.xaml.cs
@@ -13,6 +13,7 @@ public partial class MainWindow : Window
         private readonly Logger _Logger = LogManager.GetCurrentClassLogger();
         public MainWindow()
         {
+            Title = $"Testing v{AppDomain.CurrentDomain.SetupInformation.TargetFrameworkName}";
             InitializeComponent();
             Random random = new Random();
             Observable.Interval(TimeSpan.FromMilliseconds(250)).ObserveOnDispatcher().Subscribe(l =>

diff --git a/src/NLogViewer.TestApp/TestApp.csproj → ...gViewer.TestApp/NLogViewer.TestApp.csproj b/src/NLogViewer.TestApp/TestApp.csproj → ...gViewer.TestApp/NLogViewer.TestApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net461</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <StartupObject>TestApplication.App</StartupObject>
     <RootNamespace>TestApplication</RootNamespace>
@@ -20,7 +20,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion" Version="3.6.5" />
     <PackageReference Include="NLog" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/src/NLogViewer.sln b/src/NLogViewer.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29609.76
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "NLogViewer.TestApp\TestApp.csproj", "{FF15C180-042C-42D9-8687-24F1BEB5F4FB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLogViewer.TestApp", "NLogViewer.TestApp\NLogViewer.TestApp.csproj", "{FF15C180-042C-42D9-8687-24F1BEB5F4FB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLogViewer", "NLogViewer\NLogViewer.csproj", "{D1C5763C-DA9C-43E0-B7EA-DDC9AAA90AE7}"
 EndProject

diff --git a/src/NLogViewer/NLogViewer.csproj b/src/NLogViewer/NLogViewer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net461</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <RootNamespace>DJ</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -73,6 +73,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="GitVersionTask" Version="5.1.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NLog" Version="4.5.0" />
     <PackageReference Include="System.Reactive" Version="4.2.0" />
   </ItemGroup>