From 8ae64b8de70075a5fc5d06d42aaed96a6f89dbde Mon Sep 17 00:00:00 2001 From: Thomas Ibel Date: Fri, 25 Aug 2017 16:53:03 +0200 Subject: [PATCH] switched to .NET Standard 1.3 --- Weakly.sln | 37 +++----- Weakly.sln.DotSettings | 2 - build/Weakly.nuspec | 25 ------ build/create-package.cmd | 4 - build/publish-package.cmd | 4 - src/GlobalAssemblyInfo.cs | 16 ---- src/Weakly/Properties/AssemblyInfo.cs | 5 +- src/Weakly/Weakly.csproj | 125 ++++++-------------------- src/Weakly/Weakly.csproj.DotSettings | 8 -- src/Weakly/packages.config | 4 - 10 files changed, 38 insertions(+), 192 deletions(-) delete mode 100644 Weakly.sln.DotSettings delete mode 100644 build/Weakly.nuspec delete mode 100644 build/create-package.cmd delete mode 100644 build/publish-package.cmd delete mode 100644 src/GlobalAssemblyInfo.cs delete mode 100644 src/Weakly/Weakly.csproj.DotSettings delete mode 100644 src/Weakly/packages.config diff --git a/Weakly.sln b/Weakly.sln index b07d5cc..55f29a9 100644 --- a/Weakly.sln +++ b/Weakly.sln @@ -1,42 +1,25 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weakly", "src\Weakly\Weakly.csproj", "{AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{366666F0-906D-48CE-AF3B-299B75AA10AB}" - ProjectSection(SolutionItems) = preProject - src\GlobalAssemblyInfo.cs = src\GlobalAssemblyInfo.cs - LICENSE = LICENSE - README.md = README.md - build\Weakly.nuspec = build\Weakly.nuspec - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weakly", "src\Weakly\Weakly.csproj", "{609A4EED-A5D1-4678-BDC5-74CC397B0FC4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Debug|ARM.ActiveCfg = Debug|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Debug|x64.ActiveCfg = Debug|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Debug|x86.ActiveCfg = Debug|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Release|Any CPU.Build.0 = Release|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Release|ARM.ActiveCfg = Release|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Release|x64.ActiveCfg = Release|Any CPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}.Release|x86.ActiveCfg = Release|Any CPU + {609A4EED-A5D1-4678-BDC5-74CC397B0FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {609A4EED-A5D1-4678-BDC5-74CC397B0FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {609A4EED-A5D1-4678-BDC5-74CC397B0FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {609A4EED-A5D1-4678-BDC5-74CC397B0FC4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {10E885F4-1DF1-4AC2-A19D-AC6E545B033D} + EndGlobalSection EndGlobal diff --git a/Weakly.sln.DotSettings b/Weakly.sln.DotSettings deleted file mode 100644 index b68375c..0000000 --- a/Weakly.sln.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - NET \ No newline at end of file diff --git a/build/Weakly.nuspec b/build/Weakly.nuspec deleted file mode 100644 index 47b515f..0000000 --- a/build/Weakly.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - Weakly - Weakly - 2.7.0 - Thomas Ibel - Weakly is a collection of some useful weak-reference types available as portable class library for net45+win8+wp8+wpa81. - en-US - https://raw.github.com/tibel/Weakly/master/LICENSE - https://github.com/tibel/Weakly - https://raw.github.com/tibel/Weakly/master/build/weakly_icon.png - false - remove ExpressionHelper, ManagedRuntime and ReflectionHelper.IsReferenceEquatable() - Copyright Thomas Ibel 2013-2015 - - Weakly WeakReference WeakAction WeakFunc WeakDelegate WeakCollection WeakValueDictionary WeakEventHandler WeakEventSource Async Task - - - - - - - - diff --git a/build/create-package.cmd b/build/create-package.cmd deleted file mode 100644 index e1963d9..0000000 --- a/build/create-package.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@ECHO OFF -del *.nupkg -..\packages\NuGet.CommandLine.4.3.0\tools\NuGet.exe pack Weakly.nuspec -Symbols -pause diff --git a/build/publish-package.cmd b/build/publish-package.cmd deleted file mode 100644 index 19d8837..0000000 --- a/build/publish-package.cmd +++ /dev/null @@ -1,4 +0,0 @@ -@ECHO OFF -for /f "delims=" %%F in ('dir *.nupkg /b /o-n') do set PACKAGE=%%F -..\packages\NuGet.CommandLine.4.3.0\tools\NuGet.exe push %PACKAGE% -pause diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs deleted file mode 100644 index 2c04496..0000000 --- a/src/GlobalAssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Reflection; -using System.Resources; - -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("https://github.com/tibel/")] -[assembly: AssemblyProduct("Weakly")] -[assembly: AssemblyCopyright("Copyright © Thomas Ibel 2013-2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -[assembly: CLSCompliant(true)] - -[assembly: AssemblyVersion("2.7.0.0")] -[assembly: AssemblyFileVersion("2.7.0.0")] diff --git a/src/Weakly/Properties/AssemblyInfo.cs b/src/Weakly/Properties/AssemblyInfo.cs index 7d9ed54..8c11453 100644 --- a/src/Weakly/Properties/AssemblyInfo.cs +++ b/src/Weakly/Properties/AssemblyInfo.cs @@ -1,4 +1,3 @@ -using System.Reflection; +using System; -[assembly: AssemblyTitle("Weakly")] -[assembly: AssemblyDescription("Weakly is a collection of some useful weak-reference types.")] +[assembly: CLSCompliant(true)] diff --git a/src/Weakly/Weakly.csproj b/src/Weakly/Weakly.csproj index 347ca3e..93e3440 100644 --- a/src/Weakly/Weakly.csproj +++ b/src/Weakly/Weakly.csproj @@ -1,107 +1,34 @@ - - - + + - 11.0 - Debug - AnyCPU - {AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556} - Library - Properties - Weakly - Weakly - v4.5 - Profile259 - 512 - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + netstandard1.3 + Weakly is a collection of some useful weak-reference types. + https://github.com/tibel/ + 2.8.0 + Thomas Ibel + https://raw.github.com/tibel/Weakly/master/LICENSE + https://github.com/tibel/Weakly + https://raw.githubusercontent.com/tibel/Weakly/master/build/weakly_icon.png + true + ..\Weakly.snk + true + Copyright © Thomas Ibel 2013-2015 + Weakly WeakReference WeakAction WeakFunc WeakDelegate WeakCollection WeakValueDictionary WeakEventHandler WeakEventSource Async Task + Switched to .NET Standard 1.3 - - true - full - false + + + ..\..\bin\Debug\netstandard1.3\Weakly.xml ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - ..\..\bin\Debug\Weakly.XML - - pdbonly - true + + + ..\..\bin\Release\netstandard1.3\Weakly.xml ..\..\bin\Release\ - TRACE - prompt - 4 - ..\..\bin\Release\Weakly.XML - - - true - - ..\Weakly.snk - - - - - Weakly.snk - - - + - - Properties\GlobalAssemblyInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - \ No newline at end of file + + diff --git a/src/Weakly/Weakly.csproj.DotSettings b/src/Weakly/Weakly.csproj.DotSettings deleted file mode 100644 index 551bfc8..0000000 --- a/src/Weakly/Weakly.csproj.DotSettings +++ /dev/null @@ -1,8 +0,0 @@ - - True - True - True - True - True - True - True \ No newline at end of file diff --git a/src/Weakly/packages.config b/src/Weakly/packages.config deleted file mode 100644 index ef7549a..0000000 --- a/src/Weakly/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file