From c556cf1c0fb1019e3ed67bd340fb4e904d8adf7e Mon Sep 17 00:00:00 2001 From: Dominic Jonas Date: Mon, 3 Feb 2020 09:45:25 +0100 Subject: [PATCH 1/4] updated create branch script --- createBranch.ps1 | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/createBranch.ps1 b/createBranch.ps1 index 31f69b3..2dd14a5 100644 --- a/createBranch.ps1 +++ b/createBranch.ps1 @@ -1,6 +1,24 @@ 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" @@ -8,5 +26,6 @@ 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 \ No newline at end of file From 6b186598bfb3f1c374f87fbc72e2007aea49109c Mon Sep 17 00:00:00 2001 From: Dominic Jonas Date: Mon, 3 Feb 2020 09:47:13 +0100 Subject: [PATCH 2/4] renamed TestApp project --- .../{TestApp.csproj => NLogViewer.TestApp.csproj} | 0 src/NLogViewer.sln | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename src/NLogViewer.TestApp/{TestApp.csproj => NLogViewer.TestApp.csproj} (100%) diff --git a/src/NLogViewer.TestApp/TestApp.csproj b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj similarity index 100% rename from src/NLogViewer.TestApp/TestApp.csproj rename to src/NLogViewer.TestApp/NLogViewer.TestApp.csproj diff --git a/src/NLogViewer.sln b/src/NLogViewer.sln index dca9fe4..613ed2e 100644 --- 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 From 17f4117978ca3dc3d6dcc37c2aefc728d183aebe Mon Sep 17 00:00:00 2001 From: Dominic Jonas Date: Mon, 3 Feb 2020 09:47:48 +0100 Subject: [PATCH 3/4] replaced gitversion with gitversiontask --- src/NLogViewer.TestApp/NLogViewer.TestApp.csproj | 1 - src/NLogViewer/NLogViewer.csproj | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj index 65af759..f36cbb0 100644 --- a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj +++ b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj @@ -20,7 +20,6 @@ - diff --git a/src/NLogViewer/NLogViewer.csproj b/src/NLogViewer/NLogViewer.csproj index 235f351..5b73814 100644 --- a/src/NLogViewer/NLogViewer.csproj +++ b/src/NLogViewer/NLogViewer.csproj @@ -73,6 +73,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From 272c371bc537f3cd61290e3254606e1fea174048 Mon Sep 17 00:00:00 2001 From: Dominic Jonas Date: Mon, 3 Feb 2020 09:55:58 +0100 Subject: [PATCH 4/4] added netcoreapp 3.1; added info to testapp for which framework you are testing --- src/NLogViewer.TestApp/MainWindow.xaml | 3 +-- src/NLogViewer.TestApp/MainWindow.xaml.cs | 1 + src/NLogViewer.TestApp/NLogViewer.TestApp.csproj | 2 +- src/NLogViewer/NLogViewer.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NLogViewer.TestApp/MainWindow.xaml b/src/NLogViewer.TestApp/MainWindow.xaml index 4e9c31e..97763a4 100644 --- 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"> diff --git a/src/NLogViewer.TestApp/MainWindow.xaml.cs b/src/NLogViewer.TestApp/MainWindow.xaml.cs index dc19a80..a3eb4e0 100644 --- 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/NLogViewer.TestApp.csproj b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj index f36cbb0..e35e1af 100644 --- a/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj +++ b/src/NLogViewer.TestApp/NLogViewer.TestApp.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.0;net461 + netcoreapp3.0;netcoreapp3.1;net461 true TestApplication.App TestApplication diff --git a/src/NLogViewer/NLogViewer.csproj b/src/NLogViewer/NLogViewer.csproj index 5b73814..31aa8e3 100644 --- a/src/NLogViewer/NLogViewer.csproj +++ b/src/NLogViewer/NLogViewer.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0;net461 + netcoreapp3.0;netcoreapp3.1;net461 true DJ true