From af505e377820c4670518f7927599a0361c2cfa04 Mon Sep 17 00:00:00 2001 From: Pascal Berger Date: Fri, 23 Nov 2018 08:09:09 +0100 Subject: [PATCH] (GH-28) Target .NET Standard 2.0 --- .appveyor.yml | 6 +- nuspec/nuget/TfsUrlParser.nuspec | 6 +- setup.cake | 2 +- .../Properties/AssemblyInfo.cs | 25 ----- .../TfsUrlParser.Tests.csproj | 104 +++--------------- src/TfsUrlParser.Tests/packages.config | 12 -- src/TfsUrlParser/Properties/AssemblyInfo.cs | 25 ----- src/TfsUrlParser/TfsUrlParser.csproj | 85 +++----------- src/TfsUrlParser/packages.config | 10 -- 9 files changed, 42 insertions(+), 233 deletions(-) delete mode 100644 src/TfsUrlParser.Tests/packages.config delete mode 100644 src/TfsUrlParser/packages.config diff --git a/.appveyor.yml b/.appveyor.yml index 52e5097..2b5f541 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,3 +1,8 @@ +#---------------------------------# +# Build Image # +#---------------------------------# +image: Visual Studio 2017 + #---------------------------------# # Build Script # #---------------------------------# @@ -22,5 +27,4 @@ branches: # Build Cache # #---------------------------------# cache: -- src\packages -> src\**\packages.config - tools -> setup.cake \ No newline at end of file diff --git a/nuspec/nuget/TfsUrlParser.nuspec b/nuspec/nuget/TfsUrlParser.nuspec index 789ebfb..a5047f6 100644 --- a/nuspec/nuget/TfsUrlParser.nuspec +++ b/nuspec/nuget/TfsUrlParser.nuspec @@ -18,8 +18,8 @@ https://github.com/bbtsoftware/TfsUrlParser/releases/tag/1.2.1 - - - + + + diff --git a/setup.cake b/setup.cake index 466130f..c4b6f89 100644 --- a/setup.cake +++ b/setup.cake @@ -22,4 +22,4 @@ ToolSettings.SetToolSettings( testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs"); -Build.Run(); +Build.RunDotNetCore(); diff --git a/src/TfsUrlParser.Tests/Properties/AssemblyInfo.cs b/src/TfsUrlParser.Tests/Properties/AssemblyInfo.cs index dc24665..16f9123 100644 --- a/src/TfsUrlParser.Tests/Properties/AssemblyInfo.cs +++ b/src/TfsUrlParser.Tests/Properties/AssemblyInfo.cs @@ -1,18 +1,6 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TfsUrlParser")] -[assembly: AssemblyDescription("Tests for Azure DevOps URL Parser URL Parser")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BBT Software AG")] -[assembly: AssemblyProduct("TfsUrlParser")] -[assembly: AssemblyCopyright("Copyright © BBT Software AG")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -20,16 +8,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("6d16103d-8d2a-4e00-862a-2ad3c00e2883")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/TfsUrlParser.Tests/TfsUrlParser.Tests.csproj b/src/TfsUrlParser.Tests/TfsUrlParser.Tests.csproj index b50bb44..100cc4b 100644 --- a/src/TfsUrlParser.Tests/TfsUrlParser.Tests.csproj +++ b/src/TfsUrlParser.Tests/TfsUrlParser.Tests.csproj @@ -1,101 +1,29 @@ - - - - - + - Debug - AnyCPU - {6D16103D-8D2A-4E00-862A-2AD3C00E2883} - Library - Properties - TfsUrlParser.Tests - TfsUrlParser.Tests - v4.5.2 - 512 - - + netcoreapp2.0 + false + TfsUrlParser + BBT Software AG + TfsUrlParser + Tests for Azure DevOps URL Parser URL Parser + Copyright © BBT Software AG + ..\TfsUrlParser.Tests.ruleset + bin\$(Configuration)\ - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\TfsUrlParser.Tests.ruleset pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\TfsUrlParser.Tests.ruleset - - ..\packages\Shouldly.2.8.3\lib\net451\Shouldly.dll - True - - - - - - - - - - - ..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.assert.2.4.1\lib\netstandard1.1\xunit.assert.dll - - - ..\packages\xunit.extensibility.core.2.4.1\lib\net452\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.4.1\lib\net452\xunit.execution.desktop.dll - - - - - - - - - - - - - {0e778b55-ffc8-43d3-904c-a44797a5086c} - TfsUrlParser - - - - + + + + all + - + - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file diff --git a/src/TfsUrlParser.Tests/packages.config b/src/TfsUrlParser.Tests/packages.config deleted file mode 100644 index c40b955..0000000 --- a/src/TfsUrlParser.Tests/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/TfsUrlParser/Properties/AssemblyInfo.cs b/src/TfsUrlParser/Properties/AssemblyInfo.cs index 44abdb8..42de43d 100644 --- a/src/TfsUrlParser/Properties/AssemblyInfo.cs +++ b/src/TfsUrlParser/Properties/AssemblyInfo.cs @@ -3,18 +3,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TfsUrlParser")] -[assembly: AssemblyDescription("Azure DevOps URL Parser URL Parser")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("BBT Software AG")] -[assembly: AssemblyProduct("TfsUrlParser")] -[assembly: AssemblyCopyright("Copyright © BBT Software AG")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -23,18 +11,5 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("0e778b55-ffc8-43d3-904c-a44797a5086c")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - [assembly: CLSCompliant(true)] [assembly: InternalsVisibleTo("TfsUrlParser.Tests")] \ No newline at end of file diff --git a/src/TfsUrlParser/TfsUrlParser.csproj b/src/TfsUrlParser/TfsUrlParser.csproj index 794be0f..ef2bc4d 100644 --- a/src/TfsUrlParser/TfsUrlParser.csproj +++ b/src/TfsUrlParser/TfsUrlParser.csproj @@ -1,79 +1,28 @@ - - - + - Debug - AnyCPU - {0E778B55-FFC8-43D3-904C-A44797A5086C} - Library - Properties - TfsUrlParser - TfsUrlParser - v4.0 - 512 - - - + netstandard2.0 + TfsUrlParser + BBT Software AG + TfsUrlParser + Azure DevOps URL Parser URL Parser + Copyright © BBT Software AG + ..\TfsUrlParser.ruleset + bin\$(Configuration)\TfsUrlParser.XML + bin\$(Configuration)\ + true - true full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - bin\Debug\TfsUrlParser.XML - ..\TfsUrlParser.ruleset pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\TfsUrlParser.XML - ..\TfsUrlParser.ruleset - - - - - - - - - - - - - - - Designer - - - - - - - - - - - - - - - + + all + + + all + - - \ No newline at end of file diff --git a/src/TfsUrlParser/packages.config b/src/TfsUrlParser/packages.config deleted file mode 100644 index 7a27b73..0000000 --- a/src/TfsUrlParser/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file