From b87088848a630d5ad2c2f85a35e3003af9a9285d Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 21 Jul 2021 22:24:19 +0200 Subject: [PATCH] Switch _MVC.csproj files to "SDK Style" - Manually rewriting .csproj files - Deleting all Properties/AssemblyInfo files (now in csproj) - Deleting all packages.config files (now in csproj) - Adding Directory.Build.props/tagrget files to set defaults and allow central Package versioning - WIP: update .nuspec file (sh/could be included i csproj) --- WebDavSharp_MVC/Directory.Build.props | 17 ++ WebDavSharp_MVC/Directory.build.targets | 22 +++ .../Properties/AssemblyInfo.cs | 21 --- .../WebDAVSharp.Server.csproj | 164 ++--------------- .../WebDAVSharp.Server.nuspec | 19 +- .../WebDAVSharp.Server/packages.config | 7 - .../Properties/AssemblyInfo.cs | 35 ---- .../WebDAVSharp.WebServer.csproj | 173 +++--------------- .../WebDAVSharp.WebServer.csproj.user | 37 ---- .../WebDAVSharp.WebServer/packages.config | 14 -- 10 files changed, 91 insertions(+), 418 deletions(-) create mode 100644 WebDavSharp_MVC/Directory.Build.props create mode 100644 WebDavSharp_MVC/Directory.build.targets delete mode 100644 WebDavSharp_MVC/WebDAVSharp.Server/Properties/AssemblyInfo.cs delete mode 100644 WebDavSharp_MVC/WebDAVSharp.Server/packages.config delete mode 100644 WebDavSharp_MVC/WebDAVSharp.WebServer/Properties/AssemblyInfo.cs delete mode 100644 WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj.user delete mode 100644 WebDavSharp_MVC/WebDAVSharp.WebServer/packages.config diff --git a/WebDavSharp_MVC/Directory.Build.props b/WebDavSharp_MVC/Directory.Build.props new file mode 100644 index 0000000..6f6e3db --- /dev/null +++ b/WebDavSharp_MVC/Directory.Build.props @@ -0,0 +1,17 @@ + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + diff --git a/WebDavSharp_MVC/Directory.build.targets b/WebDavSharp_MVC/Directory.build.targets new file mode 100644 index 0000000..b506e46 --- /dev/null +++ b/WebDavSharp_MVC/Directory.build.targets @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/Properties/AssemblyInfo.cs b/WebDavSharp_MVC/WebDAVSharp.Server/Properties/AssemblyInfo.cs deleted file mode 100644 index dbc1557..0000000 --- a/WebDavSharp_MVC/WebDAVSharp.Server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("WebDAVSharp.Server")] -[assembly: AssemblyDescription("WebDAV Server implementation for WebDAV#")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WebDAVSharp")] -[assembly: AssemblyCopyright("")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("947fc4a0-9ed5-4d6c-9a97-9daf02524439")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] -[assembly: NeutralResourcesLanguage("en")] -[assembly: CLSCompliant(true)] -[assembly: InternalsVisibleTo("WebDAVSharp.Server.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b3873160e2fe02227fcc8df15c8beb7bb90a43f375f587ed283f770172cb6215fe4ab11c07508c97cda3220b36e2f59a246b9ab659a49dfd360bbbac1b7bf4e84f1d8c356f6504c3659d8c8742d7cb591254674898fdff5121bd8fd79953ad43bed463fe054b62d27a83ae561380562cd624d775353697c0e28194bd0896df97")] \ No newline at end of file diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.csproj b/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.csproj index 6bce6c8..31e69bd 100644 --- a/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.csproj +++ b/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.csproj @@ -1,159 +1,23 @@ - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 + net48 {BE8A04DD-C704-40B2-8AD2-3655B429FAE1} - Library - Properties + ./ WebDAVSharp.Server + + + WebDAVSharp.Server - v4.5 - 512 - - - ..\ - true - - - - - true - portable - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - bin\Debug\WebDAVSharp.Server.XML - false - latest - 1572,1573,1591,1734 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - bin\Release\WebDAVSharp.Server.XML - false - latest - 1572,1573,1591 - - - bin\ReleaseBinaries\ - TRACE;USE_RELEASE_KEY - bin\Release\WebDAVSharp.Server.XML - true - false - pdbonly - AnyCPU - prompt - false - false - false - false - latest - - - false - - - ..\Lasse V. Karlsen.snk + WebDAV Server implementation for WebDAV# + 1.5.0.0 + - - ..\..\..\Common\packages\Common.Logging.3.4.1\lib\net40\Common.Logging.dll - - - ..\..\..\Common\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.nuspec b/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.nuspec index e063f9a..26d3b60 100644 --- a/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.nuspec +++ b/WebDavSharp_MVC/WebDAVSharp.Server/WebDAVSharp.Server.nuspec @@ -2,20 +2,19 @@ WebDAVSharp.Server - 1.0.7 + 1.5.0 WebDAV# Server - Ewout Merckx,Lieven Janssen - Xplore+ + Lasse V. Karlsen,Ewout Merckx,Lieven Janssen,Franz Heinz,Michael Vesely + ART-ist http://webdavsharp.github.io/ https://raw.githubusercontent.com/WebDAVSharp/WebDAVSharp.Server/master/Icon.png false - A WebDAV server, coded in C#, which can be used for various WebDAV .NET applications. - -This server was based on another open source project, also called WebDAV#, maintained by Lasse V. Karlsen. - The WebDAV server was based on another open source project, also called WebDAV#, maintained by Lasse V. Karlsen. -This version of WebDAV# has been developed by Lieven Janssen and Ewout Merckx. - 2014 Xplore+ - WebDAV, server, WebDAVSharp, WebDAV#, API, framework, Xplore+ + A WebDAV server, coded in C#, which can be used for various WebDAV .NET applications. + + The WebDAV server was based on another open source project, also called WebDAV#, maintained by Lieven Janssen and Ewout Merckx + wich was based on another open source project, also called WebDAV#, maintained by Lasse V. Karlsen. +This version of WebDAV# has been developed by Franz Heinz,Michael Vesely. + WebDAV, server, WebDAVSharp, WebDAV#, API, Framework, MVC, WebApi diff --git a/WebDavSharp_MVC/WebDAVSharp.Server/packages.config b/WebDavSharp_MVC/WebDAVSharp.Server/packages.config deleted file mode 100644 index f4a68e8..0000000 --- a/WebDavSharp_MVC/WebDAVSharp.Server/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/WebDavSharp_MVC/WebDAVSharp.WebServer/Properties/AssemblyInfo.cs b/WebDavSharp_MVC/WebDAVSharp.WebServer/Properties/AssemblyInfo.cs deleted file mode 100644 index 96b0bb1..0000000 --- a/WebDavSharp_MVC/WebDAVSharp.WebServer/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +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("WebDAVSharp.WebServer")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WebDAVSharp.WebServer")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[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("61960a13-2683-468d-ac74-8ed97207f395")] - -// 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 Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj b/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj index 0ec9558..7cb4511 100644 --- a/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj +++ b/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj @@ -1,146 +1,44 @@ - - - - + + + - Debug - AnyCPU - - - 2.0 + net48 {61960A13-2683-468D-AC74-8ED97207F395} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties + ../WebDAVSharp.Server WebApplication - WebApplication - v4.5.2 + + + + WebDAVSharp.WebApplication + WebDAVSharp.WebApplication + Copyright © 2016 + 1.5.0.0 + + + true - - - - - true - portable - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 + - - ..\WebDAVSharp.Server\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - True - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Deployment.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Webpages.Razor.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Webpages.3.2.3\lib\net45\System.Web.Helpers.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll - - - ..\WebDAVSharp.Server\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll - - - ..\WebDAVSharp.Server\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll - - - - - - - - - - - - Global.asax - - - - - - Designer - - - - Web.config - - - Web.config - - - - - - - - - {BE8A04DD-C704-40B2-8AD2-3655B429FAE1} - WebDAVSharp.Server - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - + @@ -159,18 +57,5 @@ - - - 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/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj.user b/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj.user deleted file mode 100644 index 086df56..0000000 --- a/WebDavSharp_MVC/WebDAVSharp.WebServer/WebDAVSharp.WebServer.csproj.user +++ /dev/null @@ -1,37 +0,0 @@ - - - - true - 600 - True - False - True - - False - - - - - - - - NoStartPage - True - False - False - False - - - - - - - - - True - True - - - - - \ No newline at end of file diff --git a/WebDavSharp_MVC/WebDAVSharp.WebServer/packages.config b/WebDavSharp_MVC/WebDAVSharp.WebServer/packages.config deleted file mode 100644 index 18f5511..0000000 --- a/WebDavSharp_MVC/WebDAVSharp.WebServer/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file