From 26d905c6f0a4120f5d690acb6c3ff1168fbb3891 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Sat, 28 Nov 2020 12:16:38 +0000 Subject: [PATCH] Explicitly target net5.0-windows Things worked when referenced from a net5.0-windows project anyway, but might as well keep with the times --- Rakefile | 11 ++-- Stylet/Stylet.csproj | 13 ++--- .../Properties/AssemblyInfo.cs | 55 ------------------- .../StyletIntegrationTests.csproj | 8 +-- .../Company.StyletApplication1.csproj | 24 ++++---- StyletUnitTests/Properties/AssemblyInfo.cs | 36 ------------ StyletUnitTests/StyletUnitTests.csproj | 8 ++- global.json | 9 --- 8 files changed, 31 insertions(+), 133 deletions(-) delete mode 100644 StyletIntegrationTests/Properties/AssemblyInfo.cs delete mode 100644 StyletUnitTests/Properties/AssemblyInfo.cs delete mode 100644 global.json diff --git a/Rakefile b/Rakefile index 6f305ad..f0dc92c 100644 --- a/Rakefile +++ b/Rakefile @@ -19,20 +19,21 @@ directory COVERAGE_DIR desc "Build the project using the current CONFIG (or Debug)" task :build do - sh 'dotnet', 'build', '-c', CONFIG, CSPROJ + # https://github.com/novotnyllc/MSBuildSdkExtras/pull/249 + sh 'dotnet', 'build', '-c', CONFIG, CSPROJ, '/nowarn:MSB4011' end desc "Run unit tests using the current CONFIG (or Debug)" task :test do - sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS + sh 'dotnet', 'test', '-c', CONFIG, UNIT_TESTS, '/nowarn:MSB4011' end desc "Create NuGet package" task :package do # Not sure why these have to be this way around, but they do - sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}" - sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true' - sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ + sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, "-p:NuSpecFile=../#{NUSPEC_START}", '/nowarn:MSB4011' + sh 'dotnet', 'pack', '--no-build', '-c', CONFIG, CSPROJ, '-p:IncludeSymbols=true', '/nowarn:MSB4011' + sh 'dotnet', 'pack', '-c', CONFIG, TEMPLATES_CSPROJ, '/nowarn:MSB4011' end desc "Bump version number" diff --git a/Stylet/Stylet.csproj b/Stylet/Stylet.csproj index b7915c3..6cb4196 100644 --- a/Stylet/Stylet.csproj +++ b/Stylet/Stylet.csproj @@ -1,14 +1,11 @@ - + Library - net45;netcoreapp3.0 + net45;netcoreapp3.0;netcoreapp3.1;net5.0-windows + false true - Stylet - Stylet - Stylet - false bin\Stylet.xml @@ -23,7 +20,7 @@ https://github.com/canton7/Stylet Antony Male A very lightweight but powerful ViewModel-First MVVM framework for WPF, inspired by Caliburn.Micro. - + snupkg @@ -36,7 +33,7 @@ full - + diff --git a/StyletIntegrationTests/Properties/AssemblyInfo.cs b/StyletIntegrationTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 1977897..0000000 --- a/StyletIntegrationTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows; - -// 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("StyletIntegrationTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Antony Male")] -[assembly: AssemblyProduct("StyletIntegrationTests")] -[assembly: AssemblyCopyright("Copyright © Antony Male 2014")] -[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. -[assembly: ComVisible(false)] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - - -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] - - -// 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/StyletIntegrationTests/StyletIntegrationTests.csproj b/StyletIntegrationTests/StyletIntegrationTests.csproj index 70a3174..bc6c977 100644 --- a/StyletIntegrationTests/StyletIntegrationTests.csproj +++ b/StyletIntegrationTests/StyletIntegrationTests.csproj @@ -2,14 +2,12 @@ WinExe - net45;netcoreapp3.0 + net45;netcoreapp3.1;net5.0-windows true - false - StyletIntegrationTests - StyletIntegrationTests - false + + Copyright © 2014 Antony Male diff --git a/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj b/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj index 53ed30d..c26792d 100644 --- a/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj +++ b/StyletTemplates/templates/StyletApplication-CSharp/Company.StyletApplication1.csproj @@ -1,14 +1,14 @@ - - - - WinExe - netcoreapp3.1 - Company.StyletApplication1 - true - - + + + + WinExe + netcoreapp3.1 + Company.StyletApplication1 + true + + - - - + + + \ No newline at end of file diff --git a/StyletUnitTests/Properties/AssemblyInfo.cs b/StyletUnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 64387ab..0000000 --- a/StyletUnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -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("StyletUnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Antony Male")] -[assembly: AssemblyProduct("StyletUnitTests")] -[assembly: AssemblyCopyright("Copyright © Antony Male 2014")] -[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. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("ffe39040-7d51-464f-9f06-9df7f0284536")] - -// 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/StyletUnitTests/StyletUnitTests.csproj b/StyletUnitTests/StyletUnitTests.csproj index 53b2379..a4f81e9 100644 --- a/StyletUnitTests/StyletUnitTests.csproj +++ b/StyletUnitTests/StyletUnitTests.csproj @@ -1,14 +1,16 @@ - + - netcoreapp3.0;net45 + net5.0-windows true false - false + + Copyright © 2014 Antony Male + diff --git a/global.json b/global.json deleted file mode 100644 index f25e19b..0000000 --- a/global.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "sdk": { - "version": "3.1.100", - "rollForward": "latestFeature" - }, - "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.0.24" - } -} \ No newline at end of file