From 33f8ccda1cc5e52c52565d2c69a2d7fdb12b0ef3 Mon Sep 17 00:00:00 2001 From: Joshua Yates Date: Fri, 22 Mar 2019 10:16:28 +0000 Subject: [PATCH] Update target frameworks to .NET Framework 4.0 and .NET Standard 1.3 (#7) * Target EnumDisplayName project to .NET Standard 1.3 and .NET Framework 4.0 * Target EnumDisplayName.Test to .NET Core 2.0 and .NET Framework 4.5.2 * Address xunit exception type warnings * Format .csproj files * Add NuGet information * Update appveyor configuration --- Enable.EnumDisplayName.sln | 31 ++-- appveyor.yml | 25 +++- src/EnumDisplayName/EnumDisplayName.csproj | 80 ++++------- src/EnumDisplayName/EnumDisplayName.nuspec | 19 --- src/EnumDisplayName/EnumExtensions.cs | 4 + .../Properties/AssemblyInfo.cs | 11 -- src/EnumDisplayName/packages.config | 5 - .../EnumDisplayName.Test.csproj | 136 +++++------------- ...DisplayNameAttributeGetDisplayNameTests.cs | 6 +- .../EnumDisplayNameAttributeTests.cs | 12 +- .../Properties/AssemblyInfo.cs | 10 -- .../Resources/InternalMockEnum.Designer.cs | 2 +- .../Resources/MockEnum.Designer.cs | 2 +- test/EnumDisplayName.Test/packages.config | 12 -- 14 files changed, 118 insertions(+), 237 deletions(-) delete mode 100644 src/EnumDisplayName/EnumDisplayName.nuspec delete mode 100644 src/EnumDisplayName/Properties/AssemblyInfo.cs delete mode 100644 src/EnumDisplayName/packages.config delete mode 100644 test/EnumDisplayName.Test/Properties/AssemblyInfo.cs delete mode 100644 test/EnumDisplayName.Test/packages.config diff --git a/Enable.EnumDisplayName.sln b/Enable.EnumDisplayName.sln index c9e55bc..9b0de10 100644 --- a/Enable.EnumDisplayName.sln +++ b/Enable.EnumDisplayName.sln @@ -7,36 +7,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B148408C-C36 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9178269F-0E3D-4CDF-93FC-4C80CFCFD6EE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnumDisplayName", "src\EnumDisplayName\EnumDisplayName.csproj", "{E82E2F73-7CF5-4456-9D12-F6606B11365C}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnumDisplayName.Test", "test\EnumDisplayName.Test\EnumDisplayName.Test.csproj", "{0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A78E82A5-262D-4736-A4AF-CAEE12897981}" ProjectSection(SolutionItems) = preProject CodeMaid.config = CodeMaid.config CustomExtendedCorrectnessRules.ruleset = CustomExtendedCorrectnessRules.ruleset EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumDisplayName", "src\EnumDisplayName\EnumDisplayName.csproj", "{A586C4D7-7621-4A03-9EE9-0D98D25D91F6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EnumDisplayName.Test", "test\EnumDisplayName.Test\EnumDisplayName.Test.csproj", "{D4B5A508-B123-4D71-841B-6A8A20C3CB56}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E82E2F73-7CF5-4456-9D12-F6606B11365C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E82E2F73-7CF5-4456-9D12-F6606B11365C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E82E2F73-7CF5-4456-9D12-F6606B11365C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E82E2F73-7CF5-4456-9D12-F6606B11365C}.Release|Any CPU.Build.0 = Release|Any CPU - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1}.Release|Any CPU.Build.0 = Release|Any CPU + {A586C4D7-7621-4A03-9EE9-0D98D25D91F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A586C4D7-7621-4A03-9EE9-0D98D25D91F6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A586C4D7-7621-4A03-9EE9-0D98D25D91F6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A586C4D7-7621-4A03-9EE9-0D98D25D91F6}.Release|Any CPU.Build.0 = Release|Any CPU + {D4B5A508-B123-4D71-841B-6A8A20C3CB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4B5A508-B123-4D71-841B-6A8A20C3CB56}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4B5A508-B123-4D71-841B-6A8A20C3CB56}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4B5A508-B123-4D71-841B-6A8A20C3CB56}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {E82E2F73-7CF5-4456-9D12-F6606B11365C} = {B148408C-C362-4B8C-8892-DB075E781CE1} - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1} = {9178269F-0E3D-4CDF-93FC-4C80CFCFD6EE} + {A586C4D7-7621-4A03-9EE9-0D98D25D91F6} = {B148408C-C362-4B8C-8892-DB075E781CE1} + {D4B5A508-B123-4D71-841B-6A8A20C3CB56} = {9178269F-0E3D-4CDF-93FC-4C80CFCFD6EE} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {34815F33-2BBC-44F6-BE22-7545E2DE857D} EndGlobalSection EndGlobal diff --git a/appveyor.yml b/appveyor.yml index 28abcd4..223cf29 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,15 +1,26 @@ -version: 1.0.{build} +version: 2.0.{build} configuration: Release -assembly_info: + +image: Visual Studio 2017 + +environment: + DOTNET_CLI_TELEMETRY_OPTOUT: true + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + +dotnet_csproj: patch: true - file: '**\AssemblyInfo.*' - assembly_version: '{version}' - assembly_file_version: '{version}' - assembly_informational_version: '{version}' + file: '**\*.csproj' + version: '{version}' + before_build: -- cmd: nuget restore -verbosity quiet + - cmd: dotnet restore + build: publish_nuget: true parallel: true verbosity: minimal + +test: + assemblies: '**\*.Tests.dll' + deploy: off \ No newline at end of file diff --git a/src/EnumDisplayName/EnumDisplayName.csproj b/src/EnumDisplayName/EnumDisplayName.csproj index dfc1cf4..9786188 100644 --- a/src/EnumDisplayName/EnumDisplayName.csproj +++ b/src/EnumDisplayName/EnumDisplayName.csproj @@ -1,58 +1,38 @@ - - - + + - Debug - AnyCPU - {E82E2F73-7CF5-4456-9D12-F6606B11365C} - Library - Properties - Enable.EnumDisplayName - Enable.EnumDisplayName - v4.0 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\CustomExtendedCorrectnessRules.ruleset - true + netstandard1.3;net40 + ../../CustomExtendedCorrectnessRules.ruleset + latest - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - ..\..\CustomExtendedCorrectnessRules.ruleset - true + + + Enable.EnumDisplayName + + Enable + C# attribute and extensions for setting and retrieving enum display names. + Copyright © Enable + https://github.com/EnableSoftware/Enable.EnumDisplayName + https://github.com/EnableSoftware.png + https://raw.githubusercontent.com/EnableSoftware/Enable.EnumDisplayName/master/LICENSE + https://github.com/EnableSoftware/Enable.EnumDisplayName + - - - + + + all + runtime; build; native; contentfiles; analyzers + - - - - - - - + + + + - - - ..\..\packages\Enable.Common.Argument.1.0.0\lib\net40\Enable.Common.Argument.dll - True - - + + - - \ No newline at end of file + + diff --git a/src/EnumDisplayName/EnumDisplayName.nuspec b/src/EnumDisplayName/EnumDisplayName.nuspec deleted file mode 100644 index 9cc4aa7..0000000 --- a/src/EnumDisplayName/EnumDisplayName.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - $id$ - $version$ - $author$ - Enable - https://raw.githubusercontent.com/EnableSoftware/Enable.EnumDisplayName/master/LICENSE - https://github.com/EnableSoftware/Enable.EnumDisplayName - https://github.com/EnableSoftware.png - false - $description$ - Copyright 2017 - - - - - diff --git a/src/EnumDisplayName/EnumExtensions.cs b/src/EnumDisplayName/EnumExtensions.cs index d71e16d..85d1f1f 100644 --- a/src/EnumDisplayName/EnumExtensions.cs +++ b/src/EnumDisplayName/EnumExtensions.cs @@ -2,6 +2,10 @@ using System.ComponentModel.DataAnnotations; using System.Linq; +#if NETSTANDARD1_3 +using System.Reflection; +#endif + namespace Enable.EnumDisplayName { public static class EnumExtensions diff --git a/src/EnumDisplayName/Properties/AssemblyInfo.cs b/src/EnumDisplayName/Properties/AssemblyInfo.cs deleted file mode 100644 index 1477660..0000000 --- a/src/EnumDisplayName/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Enable.EnumDisplayName")] -[assembly: AssemblyDescription("Enable.EnumDisplayName")] -[assembly: AssemblyCompany("Enable · enable.com")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] -[assembly: AssemblyVersion("1.0.*")] diff --git a/src/EnumDisplayName/packages.config b/src/EnumDisplayName/packages.config deleted file mode 100644 index 5476f4e..0000000 --- a/src/EnumDisplayName/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/test/EnumDisplayName.Test/EnumDisplayName.Test.csproj b/test/EnumDisplayName.Test/EnumDisplayName.Test.csproj index f6795ac..59a80e5 100644 --- a/test/EnumDisplayName.Test/EnumDisplayName.Test.csproj +++ b/test/EnumDisplayName.Test/EnumDisplayName.Test.csproj @@ -1,117 +1,57 @@ - - - - + + - Debug - AnyCPU - {0B7CBB4B-3A2F-4F4E-BB9D-DF224C0C8AA1} - Library - Properties + netcoreapp2.0;net452 Enable.EnumDisplayName - Enable.EnumDisplayName.Test - v4.7 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true - ..\..\CustomExtendedCorrectnessRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - ..\..\CustomExtendedCorrectnessRules.ruleset + ../../CustomExtendedCorrectnessRules.ruleset + - - ..\..\packages\AutoFixture.3.50.3\lib\net40\Ploeh.AutoFixture.dll - - - - - - - - - - - - - ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll - - - ..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll - - - ..\..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll - - - ..\..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll - + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + - - - - - - - - True + + + + + True + True InternalMockEnum.resx - - True + True + True MockEnum.resx + - - - - - - - - - - - - {e82e2f73-7cf5-4456-9d12-f6606b11365c} - EnumDisplayName - - - - - ResXFileCodeGenerator + InternalMockEnum.Designer.cs + ResXFileCodeGenerator + Enable.EnumDisplayName.Resources - - PublicResXFileCodeGenerator + MockEnum.Designer.cs + PublicResXFileCodeGenerator + Enable.EnumDisplayName.Resources - - - - 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/test/EnumDisplayName.Test/EnumDisplayNameAttributeGetDisplayNameTests.cs b/test/EnumDisplayName.Test/EnumDisplayNameAttributeGetDisplayNameTests.cs index 51cc142..1e268c7 100644 --- a/test/EnumDisplayName.Test/EnumDisplayNameAttributeGetDisplayNameTests.cs +++ b/test/EnumDisplayName.Test/EnumDisplayNameAttributeGetDisplayNameTests.cs @@ -1,5 +1,5 @@ using System; -using Ploeh.AutoFixture; +using AutoFixture; using Xunit; namespace Enable.EnumDisplayName @@ -38,7 +38,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenResourceNotFound() }); // Assert - Assert.Throws(typeof(InvalidOperationException), action); + Assert.Throws(action); } [Fact] @@ -54,7 +54,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenResourceIsInternal() }); // Assert - Assert.Throws(typeof(InvalidOperationException), action); + Assert.Throws(action); } [Fact] diff --git a/test/EnumDisplayName.Test/EnumDisplayNameAttributeTests.cs b/test/EnumDisplayName.Test/EnumDisplayNameAttributeTests.cs index f909172..3574e52 100644 --- a/test/EnumDisplayName.Test/EnumDisplayNameAttributeTests.cs +++ b/test/EnumDisplayName.Test/EnumDisplayNameAttributeTests.cs @@ -1,5 +1,5 @@ using System; -using Ploeh.AutoFixture; +using AutoFixture; using Xunit; namespace Enable.EnumDisplayName @@ -16,7 +16,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenDisplayNameIsNull() }); // Assert - Assert.Throws(typeof(ArgumentNullException), action); + Assert.Throws(action); } [Fact] @@ -29,7 +29,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenDisplayNameIsEmpty() }); // Assert - Assert.Throws(typeof(ArgumentException), action); + Assert.Throws(action); } [Fact] @@ -46,7 +46,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenResourceNameIsNull() }); // Assert - Assert.Throws(typeof(ArgumentNullException), action); + Assert.Throws(action); } [Fact] @@ -63,7 +63,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenResourceNameIsEmpty() }); // Assert - Assert.Throws(typeof(ArgumentException), action); + Assert.Throws(action); } [Fact] @@ -80,7 +80,7 @@ public void EnumDisplayNameAttribute_ThrowsWhenResourceTypeIsNull() }); // Assert - Assert.Throws(typeof(ArgumentNullException), action); + Assert.Throws(action); } [Fact] diff --git a/test/EnumDisplayName.Test/Properties/AssemblyInfo.cs b/test/EnumDisplayName.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index a263ae8..0000000 --- a/test/EnumDisplayName.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Enable.EnumDisplayName Tests")] -[assembly: AssemblyCompany("Enable · enable.com")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: ComVisible(false)] -[assembly: AssemblyVersion("1.0.*")] -[assembly: NeutralResourcesLanguage("en-GB")] diff --git a/test/EnumDisplayName.Test/Resources/InternalMockEnum.Designer.cs b/test/EnumDisplayName.Test/Resources/InternalMockEnum.Designer.cs index 32e47ba..d74008b 100644 --- a/test/EnumDisplayName.Test/Resources/InternalMockEnum.Designer.cs +++ b/test/EnumDisplayName.Test/Resources/InternalMockEnum.Designer.cs @@ -19,7 +19,7 @@ namespace Enable.EnumDisplayName.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class InternalMockEnum { diff --git a/test/EnumDisplayName.Test/Resources/MockEnum.Designer.cs b/test/EnumDisplayName.Test/Resources/MockEnum.Designer.cs index a0e9b56..717eae6 100644 --- a/test/EnumDisplayName.Test/Resources/MockEnum.Designer.cs +++ b/test/EnumDisplayName.Test/Resources/MockEnum.Designer.cs @@ -19,7 +19,7 @@ namespace Enable.EnumDisplayName.Resources { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class MockEnum { diff --git a/test/EnumDisplayName.Test/packages.config b/test/EnumDisplayName.Test/packages.config deleted file mode 100644 index 7e6e6a8..0000000 --- a/test/EnumDisplayName.Test/packages.config +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file