From 9555a14ddfc2493fafaff63b381d2ffde4e83fb5 Mon Sep 17 00:00:00 2001
From: Nitsch Alexander <alexander.nitsch@scs.ch>
Date: Wed, 10 Aug 2022 14:39:22 +0200
Subject: [PATCH 1/2] Update to .NET6

---
 .../YuriyGuts.RegexBuilder.TestApp.csproj     | 55 ++--------------
 .../YuriyGuts.RegexBuilder.Tests.csproj       | 64 ++++---------------
 .../YuriyGuts.RegexBuilder.csproj             | 64 ++-----------------
 3 files changed, 24 insertions(+), 159 deletions(-)

diff --git a/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj b/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
index 6a64456..57463b0 100644
--- a/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
+++ b/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
@@ -1,58 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net6.0</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DCD71530-7D6D-49E0-8893-CB119B358A57}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>YuriyGuts.RegexBuilder.Tests</RootNamespace>
-    <AssemblyName>YuriyGuts.RegexBuilder.TestApp</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj">
-      <Project>{A8F68F40-BDBD-4C68-A91A-A11B25682846}</Project>
-      <Name>YuriyGuts.RegexBuilder</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj b/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
index 373fa8a..7965641 100644
--- a/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
+++ b/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
@@ -1,41 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6B67AA82-B0A9-4DF3-8556-026903159C6F}</ProjectGuid>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>YuriyGuts.RegexBuilder.Tests</RootNamespace>
-    <AssemblyName>YuriyGuts.RegexBuilder.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System" />
-    <Reference Include="System.Core">
+    <Reference Update="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
   </ItemGroup>
@@ -45,27 +16,14 @@
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExtensionMethodTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegexBuilderTests.cs" />
-    <Compile Include="CustomRegexTests.cs" />
-    <Compile Include="RegexNodeRenderingTests.cs" />
-    <Compile Include="RegexNodeTests.cs" />
-    <Compile Include="RegexQuantifierRenderingTests.cs" />
-    <Compile Include="RegexQuantifierTests.cs" />
+    <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj">
-      <Project>{A8F68F40-BDBD-4C68-A91A-A11B25682846}</Project>
-      <Name>YuriyGuts.RegexBuilder</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj b/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
index 0cac5db..c3f88b0 100644
--- a/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
+++ b/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
@@ -1,72 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A8F68F40-BDBD-4C68-A91A-A11B25682846}</ProjectGuid>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>YuriyGuts.RegexBuilder</RootNamespace>
-    <AssemblyName>YuriyGuts.RegexBuilder</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>..\~BuildOutput\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>..\~BuildOutput\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="HelperClasses\ExtensionMethods.cs" />
-    <Compile Include="HelperClasses\RegexStringEscaper.cs" />
-    <Compile Include="RegexBuilder.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RegexNode.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeBacktrackingSuppression.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeComment.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeConcatenation.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeConditionalMatch.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeAlternation.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeCharacterRange.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeCharacterSet.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeEscapingLiteral.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeGroup.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeGroupReference.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeInlineOption.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeLiteral.cs" />
-    <Compile Include="RegexNodeTypes\RegexNodeLookAround.cs" />
-    <Compile Include="RegexQuantifier.cs" />
-    <Compile Include="HelperClasses\RegexMetaChars.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>echo F|xcopy /y "$(TargetPath)" "$(TargetDir)..\..\NuGetPackage\lib\net40\$(TargetFileName)"</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file

From b72543698c9b25505aa2d575c697c8c632f4a5b0 Mon Sep 17 00:00:00 2001
From: Nitsch Alexander <alexander.nitsch@scs.ch>
Date: Wed, 10 Aug 2022 15:14:14 +0200
Subject: [PATCH 2/2] Change target framework to .netstandard 2.0

---
 .../YuriyGuts.RegexBuilder.TestApp.csproj             |  8 +-------
 .../YuriyGuts.RegexBuilder.Tests.csproj               | 11 +----------
 .../YuriyGuts.RegexBuilder.csproj                     | 10 ++++------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj b/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
index 57463b0..36ab5c0 100644
--- a/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
+++ b/src/YuriyGuts.RegexBuilder.TestApp/YuriyGuts.RegexBuilder.TestApp.csproj
@@ -1,17 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>Exe</OutputType>
     <RootNamespace>YuriyGuts.RegexBuilder.Tests</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj b/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
index 7965641..d61443a 100644
--- a/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
+++ b/src/YuriyGuts.RegexBuilder.Tests/YuriyGuts.RegexBuilder.Tests.csproj
@@ -1,15 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Update="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
       <Visible>False</Visible>
@@ -19,9 +13,6 @@
     <ProjectReference Include="..\YuriyGuts.RegexBuilder\YuriyGuts.RegexBuilder.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
diff --git a/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj b/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
index c3f88b0..8156ac6 100644
--- a/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
+++ b/src/YuriyGuts.RegexBuilder/YuriyGuts.RegexBuilder.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Library</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageVersion>1.0.1</PackageVersion>
+    <PackageReleaseNotes>Support .netstandard 2.0</PackageReleaseNotes>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>..\~BuildOutput\Debug\</OutputPath>
@@ -12,9 +15,4 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
\ No newline at end of file