diff --git a/Mvc.RemovalCandidates/Extentions/ControlValidationTranslation.cs b/--RemovalCandidates/Extentions/ControlValidationTranslation.cs similarity index 100% rename from Mvc.RemovalCandidates/Extentions/ControlValidationTranslation.cs rename to --RemovalCandidates/Extentions/ControlValidationTranslation.cs diff --git a/Mvc.RemovalCandidates/Extentions/Extensions.HtmlHelpers_Partially.cs b/--RemovalCandidates/Extentions/Extensions.HtmlHelpers_Partially.cs similarity index 100% rename from Mvc.RemovalCandidates/Extentions/Extensions.HtmlHelpers_Partially.cs rename to --RemovalCandidates/Extentions/Extensions.HtmlHelpers_Partially.cs diff --git a/Mvc.RemovalCandidates/Mvc.RemovalCandidates.csproj b/--RemovalCandidates/Mvc.RemovalCandidates.csproj similarity index 62% rename from Mvc.RemovalCandidates/Mvc.RemovalCandidates.csproj rename to --RemovalCandidates/Mvc.RemovalCandidates.csproj index 70ce7c55c..5a148302f 100644 --- a/Mvc.RemovalCandidates/Mvc.RemovalCandidates.csproj +++ b/--RemovalCandidates/Mvc.RemovalCandidates.csproj @@ -5,8 +5,8 @@ - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Mvc.RemovalCandidates.xml + ..\bin\ + ..\bin\netstandard2.0\Mvc.RemovalCandidates.xml diff --git a/.gitignore b/.gitignore index fea2a6d5d..dcab5b24b 100644 --- a/.gitignore +++ b/.gitignore @@ -265,7 +265,7 @@ GCop.json GCopLog.txt /GCopReport.json /GCopReport.json -@Assemblies +bin /Olive.MvcJs nuget.exe /Utils/MSharp.Build/Properties/launchSettings.json diff --git a/BuildAll.bat b/BuildAll.bat index 91175ae13..a6ea37090 100644 --- a/BuildAll.bat +++ b/BuildAll.bat @@ -9,7 +9,7 @@ if ERRORLEVEL 1 (goto error) dotnet build Olive.Audit if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Encryption +dotnet build Olive.Encryption if ERRORLEVEL 1 (goto error) dotnet build Olive.Entities.Data @@ -27,73 +27,73 @@ if ERRORLEVEL 1 (goto error) dotnet build Olive.Entities.Data.SqlServer if ERRORLEVEL 1 (goto error) -dotnet build Entities\Olive.Entities.Cache.Redis +dotnet build Olive.Entities.Cache.Redis if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Aws +dotnet build Olive.Aws if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Blob.Aws +dotnet build Olive.Blob.Aws if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Compression +dotnet build Olive.Compression if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Csv +dotnet build Olive.Csv if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Drawing +dotnet build Olive.Drawing if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.Excel +dotnet build Olive.Excel if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.GeoLocation +dotnet build Olive.GeoLocation if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.PDF +dotnet build Olive.PDF if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.PushNotification +dotnet build Olive.PushNotification if ERRORLEVEL 1 (goto error) -dotnet build Services\Olive.SMS +dotnet build Olive.SMS if ERRORLEVEL 1 (goto error) -dotnet build Integration\Olive.ApiClient +dotnet build Olive.ApiClient if ERRORLEVEL 1 (goto error) -dotnet build Integration\Olive.Microservices +dotnet build Olive.Microservices if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Web +dotnet build Olive.Web if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Security +dotnet build Olive.Security if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Mvc +dotnet build Olive.Mvc if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Mvc.Testing +dotnet build Olive.Mvc.Testing if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Email +dotnet build Olive.Email if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Security.Impersonation +dotnet build Olive.Security.Impersonation if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Mvc.IpFilter +dotnet build Olive.Mvc.IpFilter if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Mvc.Security.Auth0 +dotnet build Olive.Mvc.Security.Auth0 if ERRORLEVEL 1 (goto error) -dotnet build Integration\Olive.ApiProxyGenerator +dotnet build Olive.ApiProxyGenerator if ERRORLEVEL 1 (goto error) -dotnet build Mvc\Olive.Hangfire +dotnet build Olive.Hangfire if ERRORLEVEL 1 (goto error) exit /b 0 diff --git a/Integration/Olive.ApiClient/ApiClient.Auth.cs b/Olive.ApiClient/ApiClient.Auth.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Auth.cs rename to Olive.ApiClient/ApiClient.Auth.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Delete.cs b/Olive.ApiClient/ApiClient.Delete.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Delete.cs rename to Olive.ApiClient/ApiClient.Delete.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Get.cs b/Olive.ApiClient/ApiClient.Get.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Get.cs rename to Olive.ApiClient/ApiClient.Get.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Patch.cs b/Olive.ApiClient/ApiClient.Patch.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Patch.cs rename to Olive.ApiClient/ApiClient.Patch.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Post.cs b/Olive.ApiClient/ApiClient.Post.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Post.cs rename to Olive.ApiClient/ApiClient.Post.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Put.cs b/Olive.ApiClient/ApiClient.Put.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Put.cs rename to Olive.ApiClient/ApiClient.Put.cs diff --git a/Integration/Olive.ApiClient/ApiClient.RequestInfo.cs b/Olive.ApiClient/ApiClient.RequestInfo.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.RequestInfo.cs rename to Olive.ApiClient/ApiClient.RequestInfo.cs diff --git a/Integration/Olive.ApiClient/ApiClient.Retries.cs b/Olive.ApiClient/ApiClient.Retries.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.Retries.cs rename to Olive.ApiClient/ApiClient.Retries.cs diff --git a/Integration/Olive.ApiClient/ApiClient.cs b/Olive.ApiClient/ApiClient.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiClient.cs rename to Olive.ApiClient/ApiClient.cs diff --git a/Integration/Olive.ApiClient/ApiResponseCache.cs b/Olive.ApiClient/ApiResponseCache.cs similarity index 100% rename from Integration/Olive.ApiClient/ApiResponseCache.cs rename to Olive.ApiClient/ApiResponseCache.cs diff --git a/Integration/Olive.ApiClient/Enums/ApiFallBackEventPolicy.cs b/Olive.ApiClient/Enums/ApiFallBackEventPolicy.cs similarity index 100% rename from Integration/Olive.ApiClient/Enums/ApiFallBackEventPolicy.cs rename to Olive.ApiClient/Enums/ApiFallBackEventPolicy.cs diff --git a/Integration/Olive.ApiClient/Enums/CachePolicy.cs b/Olive.ApiClient/Enums/CachePolicy.cs similarity index 100% rename from Integration/Olive.ApiClient/Enums/CachePolicy.cs rename to Olive.ApiClient/Enums/CachePolicy.cs diff --git a/Integration/Olive.ApiClient/Enums/OnApiCallError.cs b/Olive.ApiClient/Enums/OnApiCallError.cs similarity index 100% rename from Integration/Olive.ApiClient/Enums/OnApiCallError.cs rename to Olive.ApiClient/Enums/OnApiCallError.cs diff --git a/Integration/Olive.ApiClient/FallBackEvent.cs b/Olive.ApiClient/FallBackEvent.cs similarity index 100% rename from Integration/Olive.ApiClient/FallBackEvent.cs rename to Olive.ApiClient/FallBackEvent.cs diff --git a/Integration/Olive.ApiClient/GetPolicy/GetCache.cs b/Olive.ApiClient/GetPolicy/GetCache.cs similarity index 100% rename from Integration/Olive.ApiClient/GetPolicy/GetCache.cs rename to Olive.ApiClient/GetPolicy/GetCache.cs diff --git a/Integration/Olive.ApiClient/GetPolicy/GetFail.cs b/Olive.ApiClient/GetPolicy/GetFail.cs similarity index 100% rename from Integration/Olive.ApiClient/GetPolicy/GetFail.cs rename to Olive.ApiClient/GetPolicy/GetFail.cs diff --git a/Integration/Olive.ApiClient/GetPolicy/GetFresh.cs b/Olive.ApiClient/GetPolicy/GetFresh.cs similarity index 100% rename from Integration/Olive.ApiClient/GetPolicy/GetFresh.cs rename to Olive.ApiClient/GetPolicy/GetFresh.cs diff --git a/Integration/Olive.ApiClient/GetPolicy/GetImplementation.cs b/Olive.ApiClient/GetPolicy/GetImplementation.cs similarity index 100% rename from Integration/Olive.ApiClient/GetPolicy/GetImplementation.cs rename to Olive.ApiClient/GetPolicy/GetImplementation.cs diff --git a/Integration/Olive.ApiClient/GetPolicy/GetNull.cs b/Olive.ApiClient/GetPolicy/GetNull.cs similarity index 100% rename from Integration/Olive.ApiClient/GetPolicy/GetNull.cs rename to Olive.ApiClient/GetPolicy/GetNull.cs diff --git a/Integration/Olive.ApiClient/Olive.ApiClient.csproj b/Olive.ApiClient/Olive.ApiClient.csproj similarity index 87% rename from Integration/Olive.ApiClient/Olive.ApiClient.csproj rename to Olive.ApiClient/Olive.ApiClient.csproj index 34f2c3e15..f59849c62 100644 --- a/Integration/Olive.ApiClient/Olive.ApiClient.csproj +++ b/Olive.ApiClient/Olive.ApiClient.csproj @@ -12,8 +12,8 @@ true - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.ApiClient.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.ApiClient.xml 1701;1702;1705;1591;1573;NU1701 @@ -26,7 +26,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Integration/Olive.ApiClient/StronglyTypedApiProxy.cs b/Olive.ApiClient/StronglyTypedApiProxy.cs similarity index 100% rename from Integration/Olive.ApiClient/StronglyTypedApiProxy.cs rename to Olive.ApiClient/StronglyTypedApiProxy.cs diff --git a/Integration/Olive.ApiClient/Utilities/ApiClientExtensions.cs b/Olive.ApiClient/Utilities/ApiClientExtensions.cs similarity index 100% rename from Integration/Olive.ApiClient/Utilities/ApiClientExtensions.cs rename to Olive.ApiClient/Utilities/ApiClientExtensions.cs diff --git a/Integration/Olive.ApiProxyGenerator/CSharpFormatter.cs b/Olive.ApiProxyGenerator/CSharpFormatter.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/CSharpFormatter.cs rename to Olive.ApiProxyGenerator/CSharpFormatter.cs diff --git a/Integration/Olive.ApiProxyGenerator/Context.cs b/Olive.ApiProxyGenerator/Context.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Context.cs rename to Olive.ApiProxyGenerator/Context.cs diff --git a/Integration/Olive.ApiProxyGenerator/DtoDataProviderClassGenerator.cs b/Olive.ApiProxyGenerator/DtoDataProviderClassGenerator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/DtoDataProviderClassGenerator.cs rename to Olive.ApiProxyGenerator/DtoDataProviderClassGenerator.cs diff --git a/Integration/Olive.ApiProxyGenerator/DtoProgrammer.cs b/Olive.ApiProxyGenerator/DtoProgrammer.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/DtoProgrammer.cs rename to Olive.ApiProxyGenerator/DtoProgrammer.cs diff --git a/Integration/Olive.ApiProxyGenerator/DtoTypes.cs b/Olive.ApiProxyGenerator/DtoTypes.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/DtoTypes.cs rename to Olive.ApiProxyGenerator/DtoTypes.cs diff --git a/Integration/Olive.ApiProxyGenerator/Extensions.cs b/Olive.ApiProxyGenerator/Extensions.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Extensions.cs rename to Olive.ApiProxyGenerator/Extensions.cs diff --git a/Integration/Olive.ApiProxyGenerator/Helper.cs b/Olive.ApiProxyGenerator/Helper.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Helper.cs rename to Olive.ApiProxyGenerator/Helper.cs diff --git a/Integration/Olive.ApiProxyGenerator/MSharpModelProgrammer.cs b/Olive.ApiProxyGenerator/MSharpModelProgrammer.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/MSharpModelProgrammer.cs rename to Olive.ApiProxyGenerator/MSharpModelProgrammer.cs diff --git a/Integration/Olive.ApiProxyGenerator/MethodGenerator.cs b/Olive.ApiProxyGenerator/MethodGenerator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/MethodGenerator.cs rename to Olive.ApiProxyGenerator/MethodGenerator.cs diff --git a/Integration/Olive.ApiProxyGenerator/MockConfigurationClassGenerator.cs b/Olive.ApiProxyGenerator/MockConfigurationClassGenerator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/MockConfigurationClassGenerator.cs rename to Olive.ApiProxyGenerator/MockConfigurationClassGenerator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj b/Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj similarity index 96% rename from Integration/Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj rename to Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj index b1996ef0e..a2822edb4 100644 --- a/Integration/Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj +++ b/Olive.ApiProxyGenerator/Olive.ApiProxyGenerator.csproj @@ -30,7 +30,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Integration/Olive.ApiProxyGenerator/ParametersParser.cs b/Olive.ApiProxyGenerator/ParametersParser.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/ParametersParser.cs rename to Olive.ApiProxyGenerator/ParametersParser.cs diff --git a/Integration/Olive.ApiProxyGenerator/Program.cs b/Olive.ApiProxyGenerator/Program.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Program.cs rename to Olive.ApiProxyGenerator/Program.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/MSharp46ProjectCreator.cs b/Olive.ApiProxyGenerator/Project/MSharp46ProjectCreator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/MSharp46ProjectCreator.cs rename to Olive.ApiProxyGenerator/Project/MSharp46ProjectCreator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/MSharpProjectCreator.cs b/Olive.ApiProxyGenerator/Project/MSharpProjectCreator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/MSharpProjectCreator.cs rename to Olive.ApiProxyGenerator/Project/MSharpProjectCreator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/NugetCreator.cs b/Olive.ApiProxyGenerator/Project/NugetCreator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/NugetCreator.cs rename to Olive.ApiProxyGenerator/Project/NugetCreator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/ProjectCreator.cs b/Olive.ApiProxyGenerator/Project/ProjectCreator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/ProjectCreator.cs rename to Olive.ApiProxyGenerator/Project/ProjectCreator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/ProxyProjectCreator.cs b/Olive.ApiProxyGenerator/Project/ProxyProjectCreator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/ProxyProjectCreator.cs rename to Olive.ApiProxyGenerator/Project/ProxyProjectCreator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Project/ReadmeFileGenerator.cs b/Olive.ApiProxyGenerator/Project/ReadmeFileGenerator.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Project/ReadmeFileGenerator.cs rename to Olive.ApiProxyGenerator/Project/ReadmeFileGenerator.cs diff --git a/Integration/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile.pubxml b/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile.pubxml similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile.pubxml rename to Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/Integration/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile1.pubxml b/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile1.pubxml similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile1.pubxml rename to Olive.ApiProxyGenerator/Properties/PublishProfiles/FolderProfile1.pubxml diff --git a/Integration/Olive.ApiProxyGenerator/Properties/launchSettings.json b/Olive.ApiProxyGenerator/Properties/launchSettings.json similarity index 100% rename from Integration/Olive.ApiProxyGenerator/Properties/launchSettings.json rename to Olive.ApiProxyGenerator/Properties/launchSettings.json diff --git a/Integration/Olive.ApiProxyGenerator/ProxyClassProgrammer.cs b/Olive.ApiProxyGenerator/ProxyClassProgrammer.cs similarity index 100% rename from Integration/Olive.ApiProxyGenerator/ProxyClassProgrammer.cs rename to Olive.ApiProxyGenerator/ProxyClassProgrammer.cs diff --git a/Integration/Olive.ApiProxyGenerator/ProxyIcon.png b/Olive.ApiProxyGenerator/ProxyIcon.png similarity index 100% rename from Integration/Olive.ApiProxyGenerator/ProxyIcon.png rename to Olive.ApiProxyGenerator/ProxyIcon.png diff --git a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj index ec7af49a1..4461ca535 100644 --- a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj +++ b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj @@ -14,8 +14,8 @@ - ..\@Assemblies - ..\@Assemblies\netstandard2.0\Olive.Audit.DatabaseLogger.xml + ..\bin + ..\bin\netstandard2.0\Olive.Audit.DatabaseLogger.xml 1701;1702;1705;1591;NU1701 @@ -27,13 +27,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Audit.dll + ..\bin\netstandard2.0\Olive.Audit.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Olive.Audit/Olive.Audit.csproj b/Olive.Audit/Olive.Audit.csproj index 47d4070dd..06a391edf 100644 --- a/Olive.Audit/Olive.Audit.csproj +++ b/Olive.Audit/Olive.Audit.csproj @@ -14,8 +14,8 @@ - ..\@Assemblies - ..\@Assemblies\netstandard2.0\Olive.Audit.xml + ..\bin + ..\bin\netstandard2.0\Olive.Audit.xml 1701;1702;1705;1591;NU1701 @@ -27,10 +27,10 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Olive.Aws.Ses/Olive.Aws.Ses.csproj b/Olive.Aws.Ses/Olive.Aws.Ses.csproj index 32c849c91..213883494 100644 --- a/Olive.Aws.Ses/Olive.Aws.Ses.csproj +++ b/Olive.Aws.Ses/Olive.Aws.Ses.csproj @@ -12,8 +12,8 @@ true - ..\@Assemblies - ..\@Assemblies\netcoreapp2.1\Olive.Aws.Ses.xml + ..\bin + ..\bin\netcoreapp2.1\Olive.Aws.Ses.xml 1701;1702;1705;1591;1573;NU1701 @@ -26,13 +26,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Aws.dll + ..\bin\netstandard2.0\Olive.Aws.dll - ..\@Assemblies\netcoreapp2.1\Olive.Email.dll + ..\bin\netcoreapp2.1\Olive.Email.dll diff --git a/Services/Olive.Aws/AWSExtensions.cs b/Olive.Aws/AWSExtensions.cs similarity index 100% rename from Services/Olive.Aws/AWSExtensions.cs rename to Olive.Aws/AWSExtensions.cs diff --git a/Services/Olive.Aws/Olive.Aws.csproj b/Olive.Aws/Olive.Aws.csproj similarity index 89% rename from Services/Olive.Aws/Olive.Aws.csproj rename to Olive.Aws/Olive.Aws.csproj index 25c08c524..68fc25d26 100644 --- a/Services/Olive.Aws/Olive.Aws.csproj +++ b/Olive.Aws/Olive.Aws.csproj @@ -15,8 +15,8 @@ 1701;1702;1705;1591;1573;NU1701 - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Aws.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Aws.xml @@ -32,7 +32,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Services/Olive.Aws/RuntimeIdentity.cs b/Olive.Aws/RuntimeIdentity.cs similarity index 100% rename from Services/Olive.Aws/RuntimeIdentity.cs rename to Olive.Aws/RuntimeIdentity.cs diff --git a/Services/Olive.Aws/Secrets.cs b/Olive.Aws/Secrets.cs similarity index 100% rename from Services/Olive.Aws/Secrets.cs rename to Olive.Aws/Secrets.cs diff --git a/Services/Olive.Blob.Aws/AWSInfo.cs b/Olive.Blob.Aws/AWSInfo.cs similarity index 100% rename from Services/Olive.Blob.Aws/AWSInfo.cs rename to Olive.Blob.Aws/AWSInfo.cs diff --git a/Services/Olive.Blob.Aws/BlobAWSExtensions.cs b/Olive.Blob.Aws/BlobAWSExtensions.cs similarity index 100% rename from Services/Olive.Blob.Aws/BlobAWSExtensions.cs rename to Olive.Blob.Aws/BlobAWSExtensions.cs diff --git a/Services/Olive.Blob.Aws/Olive.BlobAws.csproj b/Olive.Blob.Aws/Olive.BlobAws.csproj similarity index 77% rename from Services/Olive.Blob.Aws/Olive.BlobAws.csproj rename to Olive.Blob.Aws/Olive.BlobAws.csproj index 01d23afb3..a431d4da7 100644 --- a/Services/Olive.Blob.Aws/Olive.BlobAws.csproj +++ b/Olive.Blob.Aws/Olive.BlobAws.csproj @@ -15,8 +15,8 @@ 1701;1702;1705;1591;1573;NU1701 - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.BlobAws.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.BlobAws.xml @@ -28,16 +28,16 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Aws.dll + ..\bin\netstandard2.0\Olive.Aws.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Services/Olive.Blob.Aws/S3BlobStorageProvider.cs b/Olive.Blob.Aws/S3BlobStorageProvider.cs similarity index 100% rename from Services/Olive.Blob.Aws/S3BlobStorageProvider.cs rename to Olive.Blob.Aws/S3BlobStorageProvider.cs diff --git a/Services/Olive.Blob.Aws/S3DocumentUrlBuilder.cs b/Olive.Blob.Aws/S3DocumentUrlBuilder.cs similarity index 100% rename from Services/Olive.Blob.Aws/S3DocumentUrlBuilder.cs rename to Olive.Blob.Aws/S3DocumentUrlBuilder.cs diff --git a/Services/Olive.Blob.Aws/S3FileHelper.cs b/Olive.Blob.Aws/S3FileHelper.cs similarity index 100% rename from Services/Olive.Blob.Aws/S3FileHelper.cs rename to Olive.Blob.Aws/S3FileHelper.cs diff --git a/Services/Olive.Compression/Compressor.cs b/Olive.Compression/Compressor.cs similarity index 100% rename from Services/Olive.Compression/Compressor.cs rename to Olive.Compression/Compressor.cs diff --git a/Services/Olive.Compression/Olive.Compression.csproj b/Olive.Compression/Olive.Compression.csproj similarity index 86% rename from Services/Olive.Compression/Olive.Compression.csproj rename to Olive.Compression/Olive.Compression.csproj index 251ebfae1..b0ce73d53 100644 --- a/Services/Olive.Compression/Olive.Compression.csproj +++ b/Olive.Compression/Olive.Compression.csproj @@ -16,8 +16,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Compression.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Compression.xml 1701;1702;1705;1591;1573;NU1701 @@ -29,7 +29,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Services/Olive.Compression/SevenZip.cs b/Olive.Compression/SevenZip.cs similarity index 100% rename from Services/Olive.Compression/SevenZip.cs rename to Olive.Compression/SevenZip.cs diff --git a/Services/Olive.Csv/CsvReader.cs b/Olive.Csv/CsvReader.cs similarity index 100% rename from Services/Olive.Csv/CsvReader.cs rename to Olive.Csv/CsvReader.cs diff --git a/Services/Olive.CSV/CsvWriter.cs b/Olive.Csv/CsvWriter.cs similarity index 100% rename from Services/Olive.CSV/CsvWriter.cs rename to Olive.Csv/CsvWriter.cs diff --git a/Services/Olive.Csv/Olive.Csv.csproj b/Olive.Csv/Olive.Csv.csproj similarity index 83% rename from Services/Olive.Csv/Olive.Csv.csproj rename to Olive.Csv/Olive.Csv.csproj index 5dfd07418..945924439 100644 --- a/Services/Olive.Csv/Olive.Csv.csproj +++ b/Olive.Csv/Olive.Csv.csproj @@ -16,8 +16,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Csv.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Csv.xml 1701;1702;1705;1591;1573;NU1701 @@ -29,10 +29,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Services/Olive.Drawing/BitmapHelper.cs b/Olive.Drawing/BitmapHelper.cs similarity index 100% rename from Services/Olive.Drawing/BitmapHelper.cs rename to Olive.Drawing/BitmapHelper.cs diff --git a/Services/Olive.Drawing/Extensions.cs b/Olive.Drawing/Extensions.cs similarity index 100% rename from Services/Olive.Drawing/Extensions.cs rename to Olive.Drawing/Extensions.cs diff --git a/Services/Olive.Drawing/GifPalleteGenerator.cs b/Olive.Drawing/GifPalleteGenerator.cs similarity index 100% rename from Services/Olive.Drawing/GifPalleteGenerator.cs rename to Olive.Drawing/GifPalleteGenerator.cs diff --git a/Services/Olive.Drawing/GifProcessor.cs b/Olive.Drawing/GifProcessor.cs similarity index 100% rename from Services/Olive.Drawing/GifProcessor.cs rename to Olive.Drawing/GifProcessor.cs diff --git a/Services/Olive.Drawing/GraphicExtensions.cs b/Olive.Drawing/GraphicExtensions.cs similarity index 100% rename from Services/Olive.Drawing/GraphicExtensions.cs rename to Olive.Drawing/GraphicExtensions.cs diff --git a/Services/Olive.Drawing/ImageOptimizer.cs b/Olive.Drawing/ImageOptimizer.cs similarity index 100% rename from Services/Olive.Drawing/ImageOptimizer.cs rename to Olive.Drawing/ImageOptimizer.cs diff --git a/Services/Olive.Drawing/Olive.Drawing.csproj b/Olive.Drawing/Olive.Drawing.csproj similarity index 83% rename from Services/Olive.Drawing/Olive.Drawing.csproj rename to Olive.Drawing/Olive.Drawing.csproj index f5d14c81e..7214f8314 100644 --- a/Services/Olive.Drawing/Olive.Drawing.csproj +++ b/Olive.Drawing/Olive.Drawing.csproj @@ -17,8 +17,8 @@ true - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Drawing.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Drawing.xml 1701;1702;1705;1591;1573;NU1701 @@ -30,10 +30,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Mvc/Olive.Email/Email.Sending/EmailAttachmentSerializer.cs b/Olive.Email/Email.Sending/EmailAttachmentSerializer.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/EmailAttachmentSerializer.cs rename to Olive.Email/Email.Sending/EmailAttachmentSerializer.cs diff --git a/Mvc/Olive.Email/Email.Sending/EmailDispatcher.cs b/Olive.Email/Email.Sending/EmailDispatcher.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/EmailDispatcher.cs rename to Olive.Email/Email.Sending/EmailDispatcher.cs diff --git a/Mvc/Olive.Email/Email.Sending/EmailExtensions.cs b/Olive.Email/Email.Sending/EmailExtensions.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/EmailExtensions.cs rename to Olive.Email/Email.Sending/EmailExtensions.cs diff --git a/Mvc/Olive.Email/Email.Sending/EmailOutbox.cs b/Olive.Email/Email.Sending/EmailOutbox.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/EmailOutbox.cs rename to Olive.Email/Email.Sending/EmailOutbox.cs diff --git a/Mvc/Olive.Email/Email.Sending/EmailSendingEventArgs.cs b/Olive.Email/Email.Sending/EmailSendingEventArgs.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/EmailSendingEventArgs.cs rename to Olive.Email/Email.Sending/EmailSendingEventArgs.cs diff --git a/Mvc/Olive.Email/Email.Sending/IEmailMessage.cs b/Olive.Email/Email.Sending/IEmailMessage.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/IEmailMessage.cs rename to Olive.Email/Email.Sending/IEmailMessage.cs diff --git a/Mvc/Olive.Email/Email.Sending/IEmailOutbox.cs b/Olive.Email/Email.Sending/IEmailOutbox.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/IEmailOutbox.cs rename to Olive.Email/Email.Sending/IEmailOutbox.cs diff --git a/Mvc/Olive.Email/Email.Sending/MailMessageCreator.cs b/Olive.Email/Email.Sending/MailMessageCreator.cs similarity index 100% rename from Mvc/Olive.Email/Email.Sending/MailMessageCreator.cs rename to Olive.Email/Email.Sending/MailMessageCreator.cs diff --git a/Mvc/Olive.Email/EmailConfiguration.cs b/Olive.Email/EmailConfiguration.cs similarity index 100% rename from Mvc/Olive.Email/EmailConfiguration.cs rename to Olive.Email/EmailConfiguration.cs diff --git a/Mvc/Olive.Email/Mvc.Testing/EmailTestDevCommand.cs b/Olive.Email/Mvc.Testing/EmailTestDevCommand.cs similarity index 100% rename from Mvc/Olive.Email/Mvc.Testing/EmailTestDevCommand.cs rename to Olive.Email/Mvc.Testing/EmailTestDevCommand.cs diff --git a/Mvc/Olive.Email/Olive.Email.csproj b/Olive.Email/Olive.Email.csproj similarity index 82% rename from Mvc/Olive.Email/Olive.Email.csproj rename to Olive.Email/Olive.Email.csproj index f2751f2d2..e6ad071c7 100644 --- a/Mvc/Olive.Email/Olive.Email.csproj +++ b/Olive.Email/Olive.Email.csproj @@ -14,8 +14,8 @@ true - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Email.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Email.xml 1701;1702;1705;1591;1573;NU1701 @@ -28,13 +28,13 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll diff --git a/Mvc/Olive.Email/Template/EmailExtensions.cs b/Olive.Email/Template/EmailExtensions.cs similarity index 100% rename from Mvc/Olive.Email/Template/EmailExtensions.cs rename to Olive.Email/Template/EmailExtensions.cs diff --git a/Mvc/Olive.Email/Template/IEmailTemplate.cs b/Olive.Email/Template/IEmailTemplate.cs similarity index 100% rename from Mvc/Olive.Email/Template/IEmailTemplate.cs rename to Olive.Email/Template/IEmailTemplate.cs diff --git a/Services/Olive.Encryption/AsymmetricKeyPair.cs b/Olive.Encryption/AsymmetricKeyPair.cs similarity index 100% rename from Services/Olive.Encryption/AsymmetricKeyPair.cs rename to Olive.Encryption/AsymmetricKeyPair.cs diff --git a/Services/Olive.Encryption/Encryption.Asymmetric.cs b/Olive.Encryption/Encryption.Asymmetric.cs similarity index 100% rename from Services/Olive.Encryption/Encryption.Asymmetric.cs rename to Olive.Encryption/Encryption.Asymmetric.cs diff --git a/Services/Olive.Encryption/Encryption.Symmetric.cs b/Olive.Encryption/Encryption.Symmetric.cs similarity index 100% rename from Services/Olive.Encryption/Encryption.Symmetric.cs rename to Olive.Encryption/Encryption.Symmetric.cs diff --git a/Services/Olive.Encryption/Olive.Encryption.csproj b/Olive.Encryption/Olive.Encryption.csproj similarity index 83% rename from Services/Olive.Encryption/Olive.Encryption.csproj rename to Olive.Encryption/Olive.Encryption.csproj index 7aa9447b3..13df29564 100644 --- a/Services/Olive.Encryption/Olive.Encryption.csproj +++ b/Olive.Encryption/Olive.Encryption.csproj @@ -2,8 +2,8 @@ netstandard2.0 - ..\..\@Assemblies - ..\..\@Assemblies\netstandard2.0\Olive.Encryption.xml + ..\bin + ..\bin\netstandard2.0\Olive.Encryption.xml NU1605 1701;1702;1705;1591;1573;NU1701 Olive.Encryption @@ -26,11 +26,11 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false diff --git a/Services/Olive.Encryption/SecurePassword.cs b/Olive.Encryption/SecurePassword.cs similarity index 100% rename from Services/Olive.Encryption/SecurePassword.cs rename to Olive.Encryption/SecurePassword.cs diff --git a/Services/Olive.Encryption/SecurityExtensions.cs b/Olive.Encryption/SecurityExtensions.cs similarity index 100% rename from Services/Olive.Encryption/SecurityExtensions.cs rename to Olive.Encryption/SecurityExtensions.cs diff --git a/Services/Olive.Encryption/SignedData.cs b/Olive.Encryption/SignedData.cs similarity index 100% rename from Services/Olive.Encryption/SignedData.cs rename to Olive.Encryption/SignedData.cs diff --git a/Entities/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj b/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj similarity index 77% rename from Entities/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj rename to Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj index d2561d191..f9fcfa984 100644 --- a/Entities/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj +++ b/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj @@ -1,8 +1,8 @@  netstandard2.0 - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Cache.Redis.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Entities.Cache.Redis.xml 1701;1702;1705;1591;1573;NU1701 Olive.Entities.Cache.Redis 1.0.66 @@ -30,19 +30,19 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Audit.dll + ..\bin\netstandard2.0\Olive.Audit.dll - ..\..\@Assemblies\netstandard2.0\Olive.Encryption.dll + ..\bin\netstandard2.0\Olive.Encryption.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Entities/Olive.Entities.Cache.Redis/RedisCache.Serialization.cs b/Olive.Entities.Cache.Redis/RedisCache.Serialization.cs similarity index 100% rename from Entities/Olive.Entities.Cache.Redis/RedisCache.Serialization.cs rename to Olive.Entities.Cache.Redis/RedisCache.Serialization.cs diff --git a/Entities/Olive.Entities.Cache.Redis/RedisCacheExtensions.cs b/Olive.Entities.Cache.Redis/RedisCacheExtensions.cs similarity index 100% rename from Entities/Olive.Entities.Cache.Redis/RedisCacheExtensions.cs rename to Olive.Entities.Cache.Redis/RedisCacheExtensions.cs diff --git a/Entities/Olive.Entities.Cache.Redis/RedisCacheProvider.cs b/Olive.Entities.Cache.Redis/RedisCacheProvider.cs similarity index 100% rename from Entities/Olive.Entities.Cache.Redis/RedisCacheProvider.cs rename to Olive.Entities.Cache.Redis/RedisCacheProvider.cs diff --git a/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj b/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj index b1a54b786..2af71daec 100644 --- a/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj +++ b/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj @@ -14,8 +14,8 @@ - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.MySql.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Entities.Data.MySql.xml 1701;1702;1705;1591;1573;NU1701 @@ -31,13 +31,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false diff --git a/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj b/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj index 5f2ef57d9..93fd969ea 100644 --- a/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj +++ b/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj @@ -14,8 +14,8 @@ - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.PostgreSQL.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Entities.Data.PostgreSQL.xml 1701;1702;1705;1591;1573;NU1701 @@ -27,13 +27,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj b/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj index 903b215c9..ba4b29673 100644 --- a/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj +++ b/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj @@ -14,8 +14,8 @@ - ..\@Assemblies - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.SQLite.xml + ..\bin + ..\bin\netstandard2.0\Olive.Entities.Data.SQLite.xml 1701;1702;1705;1591;NU1701 @@ -27,13 +27,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj b/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj index ba50c0c4e..8263f8a50 100644 --- a/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj +++ b/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj @@ -5,8 +5,8 @@ Olive.Entities.Data NU1605 1701;1702;1705;1591;1573;NU1701 - ..\@Assemblies - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.SqlServer.xml + ..\bin + ..\bin\netstandard2.0\Olive.Entities.Data.SqlServer.xml Olive.Entities.Data.SqlServer 1.0.33 Olive Entities Data SqlServer @@ -26,13 +26,13 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false diff --git a/Olive.Entities.Data/Olive.Entities.Data.csproj b/Olive.Entities.Data/Olive.Entities.Data.csproj index e00475b5b..e51e2ed12 100644 --- a/Olive.Entities.Data/Olive.Entities.Data.csproj +++ b/Olive.Entities.Data/Olive.Entities.Data.csproj @@ -1,8 +1,8 @@ netstandard2.0 - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Olive.Entities.Data.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Entities.Data.xml 1701;1702;1705;1591;1573;NU1701 Olive.Entities.Data 1.0.78 @@ -21,16 +21,16 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\@Assemblies\netstandard2.0\Olive.Audit.dll + ..\bin\netstandard2.0\Olive.Audit.dll - ..\@Assemblies\netstandard2.0\Olive.Encryption.dll + ..\bin\netstandard2.0\Olive.Encryption.dll - ..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Olive.Entities/Olive.Entities.csproj b/Olive.Entities/Olive.Entities.csproj index ea0ba2284..e35d0db1e 100644 --- a/Olive.Entities/Olive.Entities.csproj +++ b/Olive.Entities/Olive.Entities.csproj @@ -3,8 +3,8 @@ netstandard2.0 Olive.Entities Olive.Entities - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Olive.Entities.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Entities.xml 1701;1702;1705;1591;1573;NU1701 Olive.Entities 1.0.75 @@ -30,7 +30,7 @@ - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Services/Olive.Excel/Cell.cs b/Olive.Excel/Cell.cs similarity index 100% rename from Services/Olive.Excel/Cell.cs rename to Olive.Excel/Cell.cs diff --git a/Services/Olive.Excel/CellStyle.cs b/Olive.Excel/CellStyle.cs similarity index 100% rename from Services/Olive.Excel/CellStyle.cs rename to Olive.Excel/CellStyle.cs diff --git a/Services/Olive.Excel/Column.cs b/Olive.Excel/Column.cs similarity index 100% rename from Services/Olive.Excel/Column.cs rename to Olive.Excel/Column.cs diff --git a/Services/Olive.Excel/DropDownColumn.cs b/Olive.Excel/DropDownColumn.cs similarity index 100% rename from Services/Olive.Excel/DropDownColumn.cs rename to Olive.Excel/DropDownColumn.cs diff --git a/Services/Olive.Excel/Excel.cs b/Olive.Excel/Excel.cs similarity index 100% rename from Services/Olive.Excel/Excel.cs rename to Olive.Excel/Excel.cs diff --git a/Services/Olive.Excel/Exporter.T.cs b/Olive.Excel/Exporter.T.cs similarity index 100% rename from Services/Olive.Excel/Exporter.T.cs rename to Olive.Excel/Exporter.T.cs diff --git a/Services/Olive.Excel/Exporter.cs b/Olive.Excel/Exporter.cs similarity index 100% rename from Services/Olive.Excel/Exporter.cs rename to Olive.Excel/Exporter.cs diff --git a/Services/Olive.Excel/ExtensionMethods.cs b/Olive.Excel/ExtensionMethods.cs similarity index 100% rename from Services/Olive.Excel/ExtensionMethods.cs rename to Olive.Excel/ExtensionMethods.cs diff --git a/Services/Olive.Excel/Format.cs b/Olive.Excel/Format.cs similarity index 100% rename from Services/Olive.Excel/Format.cs rename to Olive.Excel/Format.cs diff --git a/Services/Olive.Excel/Olive.Export.csproj b/Olive.Excel/Olive.Export.csproj similarity index 79% rename from Services/Olive.Excel/Olive.Export.csproj rename to Olive.Excel/Olive.Export.csproj index 057f1e75b..11a00e7d1 100644 --- a/Services/Olive.Excel/Olive.Export.csproj +++ b/Olive.Excel/Olive.Export.csproj @@ -16,8 +16,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Export.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Export.xml 1701;1702;1705;1591;1573;NU1701 @@ -28,13 +28,13 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Services/Olive.GeoLocation/GeoLocationExtensions.cs b/Olive.GeoLocation/GeoLocationExtensions.cs similarity index 100% rename from Services/Olive.GeoLocation/GeoLocationExtensions.cs rename to Olive.GeoLocation/GeoLocationExtensions.cs diff --git a/Services/Olive.GeoLocation/GeoLocationService.cs b/Olive.GeoLocation/GeoLocationService.cs similarity index 100% rename from Services/Olive.GeoLocation/GeoLocationService.cs rename to Olive.GeoLocation/GeoLocationService.cs diff --git a/Services/Olive.GeoLocation/IGeoLocated.cs b/Olive.GeoLocation/IGeoLocated.cs similarity index 100% rename from Services/Olive.GeoLocation/IGeoLocated.cs rename to Olive.GeoLocation/IGeoLocated.cs diff --git a/Services/Olive.GeoLocation/IGeoLocation.cs b/Olive.GeoLocation/IGeoLocation.cs similarity index 100% rename from Services/Olive.GeoLocation/IGeoLocation.cs rename to Olive.GeoLocation/IGeoLocation.cs diff --git a/Services/Olive.GeoLocation/IGeoLocationService.cs b/Olive.GeoLocation/IGeoLocationService.cs similarity index 100% rename from Services/Olive.GeoLocation/IGeoLocationService.cs rename to Olive.GeoLocation/IGeoLocationService.cs diff --git a/Services/Olive.GeoLocation/Olive.GeoLocation.csproj b/Olive.GeoLocation/Olive.GeoLocation.csproj similarity index 82% rename from Services/Olive.GeoLocation/Olive.GeoLocation.csproj rename to Olive.GeoLocation/Olive.GeoLocation.csproj index 5ba1ad9de..88152f850 100644 --- a/Services/Olive.GeoLocation/Olive.GeoLocation.csproj +++ b/Olive.GeoLocation/Olive.GeoLocation.csproj @@ -3,8 +3,8 @@ netstandard2.0 Olive.GeoLocation - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.GeoLocation.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.GeoLocation.xml 1701;1702;1705;1591;1573;NU1701 Olive.GeoLocation 1.0.22 @@ -25,10 +25,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Mvc/Olive.Hangfire/ExtensionMethods.cs b/Olive.Hangfire/ExtensionMethods.cs similarity index 100% rename from Mvc/Olive.Hangfire/ExtensionMethods.cs rename to Olive.Hangfire/ExtensionMethods.cs diff --git a/Mvc/Olive.Hangfire/Olive.Hangfire.csproj b/Olive.Hangfire/Olive.Hangfire.csproj similarity index 80% rename from Mvc/Olive.Hangfire/Olive.Hangfire.csproj rename to Olive.Hangfire/Olive.Hangfire.csproj index ac7ba2356..381392d92 100644 --- a/Mvc/Olive.Hangfire/Olive.Hangfire.csproj +++ b/Olive.Hangfire/Olive.Hangfire.csproj @@ -2,8 +2,8 @@ netcoreapp2.1 - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Hangfire.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Hangfire.xml Olive.Hangfire 1.0.40 Olive Hangfire (Service) @@ -28,14 +28,14 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.dll + ..\bin\netcoreapp2.1\Olive.Mvc.dll - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Hangfire/ShceduledTasksDevCommand.cs b/Olive.Hangfire/ShceduledTasksDevCommand.cs similarity index 100% rename from Mvc/Olive.Hangfire/ShceduledTasksDevCommand.cs rename to Olive.Hangfire/ShceduledTasksDevCommand.cs diff --git a/Integration/Olive.Microservices/Microservice.cs b/Olive.Microservices/Microservice.cs similarity index 100% rename from Integration/Olive.Microservices/Microservice.cs rename to Olive.Microservices/Microservice.cs diff --git a/Integration/Olive.Microservices/MicroserviceExtensions.cs b/Olive.Microservices/MicroserviceExtensions.cs similarity index 100% rename from Integration/Olive.Microservices/MicroserviceExtensions.cs rename to Olive.Microservices/MicroserviceExtensions.cs diff --git a/Integration/Olive.Microservices/Olive.Microservices.csproj b/Olive.Microservices/Olive.Microservices.csproj similarity index 83% rename from Integration/Olive.Microservices/Olive.Microservices.csproj rename to Olive.Microservices/Olive.Microservices.csproj index 3912f1268..ab067e423 100644 --- a/Integration/Olive.Microservices/Olive.Microservices.csproj +++ b/Olive.Microservices/Olive.Microservices.csproj @@ -13,8 +13,8 @@ true - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Microservices.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.Microservices.xml 1701;1702;1705;1591;NU1701 @@ -25,10 +25,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.ApiClient.dll + ..\bin\netstandard2.0\Olive.ApiClient.dll diff --git a/Mvc/Olive.Mvc.Globalization/Abstractions/IContextLanguageProvider.cs b/Olive.Mvc.Globalization/Abstractions/IContextLanguageProvider.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Abstractions/IContextLanguageProvider.cs rename to Olive.Mvc.Globalization/Abstractions/IContextLanguageProvider.cs diff --git a/Mvc/Olive.Mvc.Globalization/Abstractions/ILanguage.cs b/Olive.Mvc.Globalization/Abstractions/ILanguage.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Abstractions/ILanguage.cs rename to Olive.Mvc.Globalization/Abstractions/ILanguage.cs diff --git a/Mvc/Olive.Mvc.Globalization/Abstractions/IPhrase.cs b/Olive.Mvc.Globalization/Abstractions/IPhrase.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Abstractions/IPhrase.cs rename to Olive.Mvc.Globalization/Abstractions/IPhrase.cs diff --git a/Mvc/Olive.Mvc.Globalization/Abstractions/ITranslationProvider.cs b/Olive.Mvc.Globalization/Abstractions/ITranslationProvider.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Abstractions/ITranslationProvider.cs rename to Olive.Mvc.Globalization/Abstractions/ITranslationProvider.cs diff --git a/Mvc/Olive.Mvc.Globalization/ContextGlobalizationExtensions.cs b/Olive.Mvc.Globalization/ContextGlobalizationExtensions.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/ContextGlobalizationExtensions.cs rename to Olive.Mvc.Globalization/ContextGlobalizationExtensions.cs diff --git a/Mvc/Olive.Mvc.Globalization/ExtensionMethods.cs b/Olive.Mvc.Globalization/ExtensionMethods.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/ExtensionMethods.cs rename to Olive.Mvc.Globalization/ExtensionMethods.cs diff --git a/Mvc/Olive.Mvc.Globalization/Google/GoogleAutoDetect.cs b/Olive.Mvc.Globalization/Google/GoogleAutoDetect.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Google/GoogleAutoDetect.cs rename to Olive.Mvc.Globalization/Google/GoogleAutoDetect.cs diff --git a/Mvc/Olive.Mvc.Globalization/Google/GoogleTranslateTypes.cs b/Olive.Mvc.Globalization/Google/GoogleTranslateTypes.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Google/GoogleTranslateTypes.cs rename to Olive.Mvc.Globalization/Google/GoogleTranslateTypes.cs diff --git a/Mvc/Olive.Mvc.Globalization/Google/GoogleTranslationProvider.cs b/Olive.Mvc.Globalization/Google/GoogleTranslationProvider.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Google/GoogleTranslationProvider.cs rename to Olive.Mvc.Globalization/Google/GoogleTranslationProvider.cs diff --git a/Mvc/Olive.Mvc.Globalization/Html/Translator.cs b/Olive.Mvc.Globalization/Html/Translator.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Html/Translator.cs rename to Olive.Mvc.Globalization/Html/Translator.cs diff --git a/Mvc/Olive.Mvc.Globalization/Html/ValidationTranslatorTagHelper.cs b/Olive.Mvc.Globalization/Html/ValidationTranslatorTagHelper.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Html/ValidationTranslatorTagHelper.cs rename to Olive.Mvc.Globalization/Html/ValidationTranslatorTagHelper.cs diff --git a/Mvc/Olive.Mvc.Globalization/Olive.Globalization.csproj b/Olive.Mvc.Globalization/Olive.Globalization.csproj similarity index 83% rename from Mvc/Olive.Mvc.Globalization/Olive.Globalization.csproj rename to Olive.Mvc.Globalization/Olive.Globalization.csproj index 6b54d712d..1d186d346 100644 --- a/Mvc/Olive.Mvc.Globalization/Olive.Globalization.csproj +++ b/Olive.Mvc.Globalization/Olive.Globalization.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Globalization.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Globalization.xml 1701;1702;1705;1591;1573;NU1701 @@ -28,11 +28,11 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false diff --git a/Mvc/Olive.Mvc.Globalization/TranslationDownloadedEventArgs.cs b/Olive.Mvc.Globalization/TranslationDownloadedEventArgs.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/TranslationDownloadedEventArgs.cs rename to Olive.Mvc.Globalization/TranslationDownloadedEventArgs.cs diff --git a/Mvc/Olive.Mvc.Globalization/Translator.cs b/Olive.Mvc.Globalization/Translator.cs similarity index 100% rename from Mvc/Olive.Mvc.Globalization/Translator.cs rename to Olive.Mvc.Globalization/Translator.cs diff --git a/Mvc/Olive.Mvc.IpFilter/IpFilter.cs b/Olive.Mvc.IpFilter/IpFilter.cs similarity index 100% rename from Mvc/Olive.Mvc.IpFilter/IpFilter.cs rename to Olive.Mvc.IpFilter/IpFilter.cs diff --git a/Mvc/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj b/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj similarity index 78% rename from Mvc/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj rename to Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj index 7e9eb241d..3abddf02b 100644 --- a/Mvc/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj +++ b/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.IpFilter.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Mvc.IpFilter.xml 1701;1702;1705;1591;1573;NU1701 @@ -28,19 +28,19 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Csv.dll + ..\bin\netstandard2.0\Olive.Csv.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Mvc.Paging/ListPagination.cs b/Olive.Mvc.Paging/ListPagination.cs similarity index 100% rename from Mvc/Olive.Mvc.Paging/ListPagination.cs rename to Olive.Mvc.Paging/ListPagination.cs diff --git a/Mvc/Olive.Mvc.Paging/ListPaginationBinder.cs b/Olive.Mvc.Paging/ListPaginationBinder.cs similarity index 100% rename from Mvc/Olive.Mvc.Paging/ListPaginationBinder.cs rename to Olive.Mvc.Paging/ListPaginationBinder.cs diff --git a/Mvc/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj b/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj similarity index 74% rename from Mvc/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj rename to Olive.Mvc.Paging/Olive.Mvc.Paging.csproj index 42df62342..50adc2c6d 100644 --- a/Mvc/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj +++ b/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj @@ -2,8 +2,8 @@ netcoreapp2.1 - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Paging.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Mvc.Paging.xml 1701;1702;1705;1591;1573;NU1701 Olive.Mvc.Paging 1.0.18 @@ -23,23 +23,23 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.dll + ..\bin\netcoreapp2.1\Olive.Mvc.dll false diff --git a/Mvc/Olive.Mvc.Paging/PaginationExtensions.cs b/Olive.Mvc.Paging/PaginationExtensions.cs similarity index 100% rename from Mvc/Olive.Mvc.Paging/PaginationExtensions.cs rename to Olive.Mvc.Paging/PaginationExtensions.cs diff --git a/Mvc/Olive.Mvc.Paging/PaginationNavigation.cs b/Olive.Mvc.Paging/PaginationNavigation.cs similarity index 100% rename from Mvc/Olive.Mvc.Paging/PaginationNavigation.cs rename to Olive.Mvc.Paging/PaginationNavigation.cs diff --git a/Mvc/Olive.Mvc.Security.Auth0/Auth0Helper.cs b/Olive.Mvc.Security.Auth0/Auth0Helper.cs similarity index 100% rename from Mvc/Olive.Mvc.Security.Auth0/Auth0Helper.cs rename to Olive.Mvc.Security.Auth0/Auth0Helper.cs diff --git a/Mvc/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj b/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj similarity index 86% rename from Mvc/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj rename to Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj index bb7857b1c..b45e04100 100644 --- a/Mvc/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj +++ b/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Security.Auth0.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Security.Auth0.xml 1701;1702;1705;1591;NU1701 @@ -28,7 +28,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false diff --git a/Mvc/Olive.Mvc.Testing/DatabaseChangeWatcher.cs b/Olive.Mvc.Testing/DatabaseChangeWatcher.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DatabaseChangeWatcher.cs rename to Olive.Mvc.Testing/DatabaseChangeWatcher.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommand.cs b/Olive.Mvc.Testing/DevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommand.cs rename to Olive.Mvc.Testing/DevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/DatabaesRunChangesDevCommand.cs b/Olive.Mvc.Testing/DevCommands/DatabaesRunChangesDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/DatabaesRunChangesDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/DatabaesRunChangesDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/DatabaseClearCacheDevCommand.cs b/Olive.Mvc.Testing/DevCommands/DatabaseClearCacheDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/DatabaseClearCacheDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/DatabaseClearCacheDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/DatabaseGetChangesDevCommand.cs b/Olive.Mvc.Testing/DevCommands/DatabaseGetChangesDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/DatabaseGetChangesDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/DatabaseGetChangesDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/DatabaseProfileDevCommand.cs b/Olive.Mvc.Testing/DevCommands/DatabaseProfileDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/DatabaseProfileDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/DatabaseProfileDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/DatabaseRestartDevCommand.cs b/Olive.Mvc.Testing/DevCommands/DatabaseRestartDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/DatabaseRestartDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/DatabaseRestartDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/InjectTimeDevCommand.cs b/Olive.Mvc.Testing/DevCommands/InjectTimeDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/InjectTimeDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/InjectTimeDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/TempDatabaseDevCommand.cs b/Olive.Mvc.Testing/DevCommands/TempDatabaseDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/TempDatabaseDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/TempDatabaseDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/DevCommands/TestContextDevCommand.cs b/Olive.Mvc.Testing/DevCommands/TestContextDevCommand.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/DevCommands/TestContextDevCommand.cs rename to Olive.Mvc.Testing/DevCommands/TestContextDevCommand.cs diff --git a/Mvc/Olive.Mvc.Testing/Extensions/TestingExtensions.cs b/Olive.Mvc.Testing/Extensions/TestingExtensions.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/Extensions/TestingExtensions.cs rename to Olive.Mvc.Testing/Extensions/TestingExtensions.cs diff --git a/Mvc/Olive.Mvc.Testing/Extensions/WebTestWidgetExtensions.cs b/Olive.Mvc.Testing/Extensions/WebTestWidgetExtensions.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/Extensions/WebTestWidgetExtensions.cs rename to Olive.Mvc.Testing/Extensions/WebTestWidgetExtensions.cs diff --git a/Mvc/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj b/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj similarity index 75% rename from Mvc/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj rename to Olive.Mvc.Testing/Olive.Mvc.Testing.csproj index 95210e365..be3b80465 100644 --- a/Mvc/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj +++ b/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj @@ -14,8 +14,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Testing.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Mvc.Testing.xml 1701;1702;1705;1591;1573;NU1701 @@ -28,26 +28,26 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Export.dll + ..\bin\netstandard2.0\Olive.Export.dll - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.dll + ..\bin\netcoreapp2.1\Olive.Mvc.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Mvc.Testing/PredictableGuidGenerator.cs b/Olive.Mvc.Testing/PredictableGuidGenerator.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/PredictableGuidGenerator.cs rename to Olive.Mvc.Testing/PredictableGuidGenerator.cs diff --git a/Mvc/Olive.Mvc.Testing/TempDb/TempDatabase.cs b/Olive.Mvc.Testing/TempDb/TempDatabase.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/TempDb/TempDatabase.cs rename to Olive.Mvc.Testing/TempDb/TempDatabase.cs diff --git a/Mvc/Olive.Mvc.Testing/TempDb/TestDatabaseGenerator.cs b/Olive.Mvc.Testing/TempDb/TestDatabaseGenerator.cs similarity index 100% rename from Mvc/Olive.Mvc.Testing/TempDb/TestDatabaseGenerator.cs rename to Olive.Mvc.Testing/TempDb/TestDatabaseGenerator.cs diff --git a/Mvc/Olive.Mvc/ActionResults/JsonNetResult.cs b/Olive.Mvc/ActionResults/JsonNetResult.cs similarity index 100% rename from Mvc/Olive.Mvc/ActionResults/JsonNetResult.cs rename to Olive.Mvc/ActionResults/JsonNetResult.cs diff --git a/Mvc/Olive.Mvc/ActionResults/NotFoundTextActionResult.cs b/Olive.Mvc/ActionResults/NotFoundTextActionResult.cs similarity index 100% rename from Mvc/Olive.Mvc/ActionResults/NotFoundTextActionResult.cs rename to Olive.Mvc/ActionResults/NotFoundTextActionResult.cs diff --git a/Mvc/Olive.Mvc/ActionResults/RangeFileContentResult.cs b/Olive.Mvc/ActionResults/RangeFileContentResult.cs similarity index 100% rename from Mvc/Olive.Mvc/ActionResults/RangeFileContentResult.cs rename to Olive.Mvc/ActionResults/RangeFileContentResult.cs diff --git a/Mvc/Olive.Mvc/ActionResults/TextActionResult.cs b/Olive.Mvc/ActionResults/TextActionResult.cs similarity index 100% rename from Mvc/Olive.Mvc/ActionResults/TextActionResult.cs rename to Olive.Mvc/ActionResults/TextActionResult.cs diff --git a/Mvc/Olive.Mvc/ActionResults/UnauthorizedTextActionResult.cs b/Olive.Mvc/ActionResults/UnauthorizedTextActionResult.cs similarity index 100% rename from Mvc/Olive.Mvc/ActionResults/UnauthorizedTextActionResult.cs rename to Olive.Mvc/ActionResults/UnauthorizedTextActionResult.cs diff --git a/Mvc/Olive.Mvc/Attributes/AuthorizeApi.cs b/Olive.Mvc/Attributes/AuthorizeApi.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/AuthorizeApi.cs rename to Olive.Mvc/Attributes/AuthorizeApi.cs diff --git a/Mvc/Olive.Mvc/Attributes/BaseCustomModelBindAttribute.cs b/Olive.Mvc/Attributes/BaseCustomModelBindAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/BaseCustomModelBindAttribute.cs rename to Olive.Mvc/Attributes/BaseCustomModelBindAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/CopyDataAttribute.cs b/Olive.Mvc/Attributes/CopyDataAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/CopyDataAttribute.cs rename to Olive.Mvc/Attributes/CopyDataAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/CustomBoundAttribute.cs b/Olive.Mvc/Attributes/CustomBoundAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/CustomBoundAttribute.cs rename to Olive.Mvc/Attributes/CustomBoundAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/FromRequestAttribute.cs b/Olive.Mvc/Attributes/FromRequestAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/FromRequestAttribute.cs rename to Olive.Mvc/Attributes/FromRequestAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/HasDefaultAttribute.cs b/Olive.Mvc/Attributes/HasDefaultAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/HasDefaultAttribute.cs rename to Olive.Mvc/Attributes/HasDefaultAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/JsonHandlerAttribute.cs b/Olive.Mvc/Attributes/JsonHandlerAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/JsonHandlerAttribute.cs rename to Olive.Mvc/Attributes/JsonHandlerAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/KeepWhiteSpaceAttribute.cs b/Olive.Mvc/Attributes/KeepWhiteSpaceAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/KeepWhiteSpaceAttribute.cs rename to Olive.Mvc/Attributes/KeepWhiteSpaceAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/LocalizedDateAttribute.cs b/Olive.Mvc/Attributes/LocalizedDateAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/LocalizedDateAttribute.cs rename to Olive.Mvc/Attributes/LocalizedDateAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/MasterDetailsAttribute.cs b/Olive.Mvc/Attributes/MasterDetailsAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/MasterDetailsAttribute.cs rename to Olive.Mvc/Attributes/MasterDetailsAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/MicroserviceAccessKeyAuthentication.cs b/Olive.Mvc/Attributes/MicroserviceAccessKeyAuthentication.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/MicroserviceAccessKeyAuthentication.cs rename to Olive.Mvc/Attributes/MicroserviceAccessKeyAuthentication.cs diff --git a/Mvc/Olive.Mvc/Attributes/OnBoundAttribute.cs b/Olive.Mvc/Attributes/OnBoundAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/OnBoundAttribute.cs rename to Olive.Mvc/Attributes/OnBoundAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/OnPreBindingAttribute.cs b/Olive.Mvc/Attributes/OnPreBindingAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/OnPreBindingAttribute.cs rename to Olive.Mvc/Attributes/OnPreBindingAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/OnPreBoundAttribute.cs b/Olive.Mvc/Attributes/OnPreBoundAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/OnPreBoundAttribute.cs rename to Olive.Mvc/Attributes/OnPreBoundAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/PushExpireClientCacheAttribute.cs b/Olive.Mvc/Attributes/PushExpireClientCacheAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/PushExpireClientCacheAttribute.cs rename to Olive.Mvc/Attributes/PushExpireClientCacheAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/RemoteDataProviderAttribute.cs b/Olive.Mvc/Attributes/RemoteDataProviderAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/RemoteDataProviderAttribute.cs rename to Olive.Mvc/Attributes/RemoteDataProviderAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/RequiredUnlessDeletingAttribute.cs b/Olive.Mvc/Attributes/RequiredUnlessDeletingAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/RequiredUnlessDeletingAttribute.cs rename to Olive.Mvc/Attributes/RequiredUnlessDeletingAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/ReturnsAttribute.cs b/Olive.Mvc/Attributes/ReturnsAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/ReturnsAttribute.cs rename to Olive.Mvc/Attributes/ReturnsAttribute.cs diff --git a/Mvc/Olive.Mvc/Attributes/TimeAttribute.cs b/Olive.Mvc/Attributes/TimeAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Attributes/TimeAttribute.cs rename to Olive.Mvc/Attributes/TimeAttribute.cs diff --git a/Mvc/Olive.Mvc/Binding/BindAttributeRunner.cs b/Olive.Mvc/Binding/BindAttributeRunner.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/BindAttributeRunner.cs rename to Olive.Mvc/Binding/BindAttributeRunner.cs diff --git a/Mvc/Olive.Mvc/Binding/BindingControllerAttribute.cs b/Olive.Mvc/Binding/BindingControllerAttribute.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/BindingControllerAttribute.cs rename to Olive.Mvc/Binding/BindingControllerAttribute.cs diff --git a/Mvc/Olive.Mvc/Binding/IViewComponent.cs b/Olive.Mvc/Binding/IViewComponent.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/IViewComponent.cs rename to Olive.Mvc/Binding/IViewComponent.cs diff --git a/Mvc/Olive.Mvc/Binding/IViewModel.cs b/Olive.Mvc/Binding/IViewModel.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/IViewModel.cs rename to Olive.Mvc/Binding/IViewModel.cs diff --git a/Mvc/Olive.Mvc/Binding/ListSortExpressionBinder.cs b/Olive.Mvc/Binding/ListSortExpressionBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/ListSortExpressionBinder.cs rename to Olive.Mvc/Binding/ListSortExpressionBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/OliveBinderProvider.cs b/Olive.Mvc/Binding/OliveBinderProvider.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/OliveBinderProvider.cs rename to Olive.Mvc/Binding/OliveBinderProvider.cs diff --git a/Mvc/Olive.Mvc/Binding/OliveModelBinder.cs b/Olive.Mvc/Binding/OliveModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/OliveModelBinder.cs rename to Olive.Mvc/Binding/OliveModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/BlobModelBinder.cs b/Olive.Mvc/Binding/Providers/BlobModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/BlobModelBinder.cs rename to Olive.Mvc/Binding/Providers/BlobModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/EntityListModelBinder.cs b/Olive.Mvc/Binding/Providers/EntityListModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/EntityListModelBinder.cs rename to Olive.Mvc/Binding/Providers/EntityListModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/EntityModelBinder.cs b/Olive.Mvc/Binding/Providers/EntityModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/EntityModelBinder.cs rename to Olive.Mvc/Binding/Providers/EntityModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/EnumListModelBinder.cs b/Olive.Mvc/Binding/Providers/EnumListModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/EnumListModelBinder.cs rename to Olive.Mvc/Binding/Providers/EnumListModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/ListModelBinder.cs b/Olive.Mvc/Binding/Providers/ListModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/ListModelBinder.cs rename to Olive.Mvc/Binding/Providers/ListModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/OptionalBooleanFilterListModelBinder.cs b/Olive.Mvc/Binding/Providers/OptionalBooleanFilterListModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/OptionalBooleanFilterListModelBinder.cs rename to Olive.Mvc/Binding/Providers/OptionalBooleanFilterListModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/OptionalBooleanFilterModelBinder.cs b/Olive.Mvc/Binding/Providers/OptionalBooleanFilterModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/OptionalBooleanFilterModelBinder.cs rename to Olive.Mvc/Binding/Providers/OptionalBooleanFilterModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/Providers/PrimitiveValueModelBinder.cs b/Olive.Mvc/Binding/Providers/PrimitiveValueModelBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/Providers/PrimitiveValueModelBinder.cs rename to Olive.Mvc/Binding/Providers/PrimitiveValueModelBinder.cs diff --git a/Mvc/Olive.Mvc/Binding/ViewModelServices.cs b/Olive.Mvc/Binding/ViewModelServices.cs similarity index 100% rename from Mvc/Olive.Mvc/Binding/ViewModelServices.cs rename to Olive.Mvc/Binding/ViewModelServices.cs diff --git a/Mvc/Olive.Mvc/Extentions/Extensions.HtmlHelpers.cs b/Olive.Mvc/Extentions/Extensions.HtmlHelpers.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/Extensions.HtmlHelpers.cs rename to Olive.Mvc/Extentions/Extensions.HtmlHelpers.cs diff --git a/Mvc/Olive.Mvc/Extentions/Extensions.SelectListItem.cs b/Olive.Mvc/Extentions/Extensions.SelectListItem.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/Extensions.SelectListItem.cs rename to Olive.Mvc/Extentions/Extensions.SelectListItem.cs diff --git a/Mvc/Olive.Mvc/Extentions/Extensions.UrlHelpers.cs b/Olive.Mvc/Extentions/Extensions.UrlHelpers.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/Extensions.UrlHelpers.cs rename to Olive.Mvc/Extentions/Extensions.UrlHelpers.cs diff --git a/Mvc/Olive.Mvc/Extentions/Extensions.cs b/Olive.Mvc/Extentions/Extensions.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/Extensions.cs rename to Olive.Mvc/Extentions/Extensions.cs diff --git a/Mvc/Olive.Mvc/Extentions/Http.cs b/Olive.Mvc/Extentions/Http.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/Http.cs rename to Olive.Mvc/Extentions/Http.cs diff --git a/Mvc/Olive.Mvc/Extentions/UseStaticFilesCaseSensitive.cs b/Olive.Mvc/Extentions/UseStaticFilesCaseSensitive.cs similarity index 100% rename from Mvc/Olive.Mvc/Extentions/UseStaticFilesCaseSensitive.cs rename to Olive.Mvc/Extentions/UseStaticFilesCaseSensitive.cs diff --git a/Mvc/Olive.Mvc/JavaScript/Controller.cs b/Olive.Mvc/JavaScript/Controller.cs similarity index 100% rename from Mvc/Olive.Mvc/JavaScript/Controller.cs rename to Olive.Mvc/JavaScript/Controller.cs diff --git a/Mvc/Olive.Mvc/JavaScript/JavascriptActions.cs b/Olive.Mvc/JavaScript/JavascriptActions.cs similarity index 100% rename from Mvc/Olive.Mvc/JavaScript/JavascriptActions.cs rename to Olive.Mvc/JavaScript/JavascriptActions.cs diff --git a/Mvc/Olive.Mvc/JavaScript/JavascriptDependency.cs b/Olive.Mvc/JavaScript/JavascriptDependency.cs similarity index 100% rename from Mvc/Olive.Mvc/JavaScript/JavascriptDependency.cs rename to Olive.Mvc/JavaScript/JavascriptDependency.cs diff --git a/Mvc/Olive.Mvc/JavaScript/JavascriptModule.cs b/Olive.Mvc/JavaScript/JavascriptModule.cs similarity index 100% rename from Mvc/Olive.Mvc/JavaScript/JavascriptModule.cs rename to Olive.Mvc/JavaScript/JavascriptModule.cs diff --git a/Mvc/Olive.Mvc/JavaScript/ViewComponent.cs b/Olive.Mvc/JavaScript/ViewComponent.cs similarity index 100% rename from Mvc/Olive.Mvc/JavaScript/ViewComponent.cs rename to Olive.Mvc/JavaScript/ViewComponent.cs diff --git a/Mvc/Olive.Mvc/Middleware/DevCommandMiddleware.cs b/Olive.Mvc/Middleware/DevCommandMiddleware.cs similarity index 100% rename from Mvc/Olive.Mvc/Middleware/DevCommandMiddleware.cs rename to Olive.Mvc/Middleware/DevCommandMiddleware.cs diff --git a/Mvc/Olive.Mvc/Middleware/ITempDatabase.cs b/Olive.Mvc/Middleware/ITempDatabase.cs similarity index 100% rename from Mvc/Olive.Mvc/Middleware/ITempDatabase.cs rename to Olive.Mvc/Middleware/ITempDatabase.cs diff --git a/Mvc/Olive.Mvc/Middleware/SplitRoleClaimsMiddleware.cs b/Olive.Mvc/Middleware/SplitRoleClaimsMiddleware.cs similarity index 100% rename from Mvc/Olive.Mvc/Middleware/SplitRoleClaimsMiddleware.cs rename to Olive.Mvc/Middleware/SplitRoleClaimsMiddleware.cs diff --git a/Mvc/Olive.Mvc/Olive.Mvc.csproj b/Olive.Mvc/Olive.Mvc.csproj similarity index 75% rename from Mvc/Olive.Mvc/Olive.Mvc.csproj rename to Olive.Mvc/Olive.Mvc.csproj index d349f48a7..d5954bb67 100644 --- a/Mvc/Olive.Mvc/Olive.Mvc.csproj +++ b/Olive.Mvc/Olive.Mvc.csproj @@ -1,8 +1,8 @@ netcoreapp2.1 - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Mvc.xml 1701;1702;1705;1591;1573;NU1701 Olive.Mvc Olive MVC @@ -21,22 +21,22 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Security.dll + ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Mvc/Services/DefaultFileUploadMarkupGenerator.cs b/Olive.Mvc/Services/DefaultFileUploadMarkupGenerator.cs similarity index 100% rename from Mvc/Olive.Mvc/Services/DefaultFileUploadMarkupGenerator.cs rename to Olive.Mvc/Services/DefaultFileUploadMarkupGenerator.cs diff --git a/Mvc/Olive.Mvc/Services/FileUploadService.cs b/Olive.Mvc/Services/FileUploadService.cs similarity index 100% rename from Mvc/Olive.Mvc/Services/FileUploadService.cs rename to Olive.Mvc/Services/FileUploadService.cs diff --git a/Mvc/Olive.Mvc/Services/RouteTemplates.cs b/Olive.Mvc/Services/RouteTemplates.cs similarity index 100% rename from Mvc/Olive.Mvc/Services/RouteTemplates.cs rename to Olive.Mvc/Services/RouteTemplates.cs diff --git a/Mvc/Olive.Mvc/Services/TempFileService.cs b/Olive.Mvc/Services/TempFileService.cs similarity index 100% rename from Mvc/Olive.Mvc/Services/TempFileService.cs rename to Olive.Mvc/Services/TempFileService.cs diff --git a/Mvc/Olive.Mvc/TagHelpers/HiddenTagHelper.cs b/Olive.Mvc/TagHelpers/HiddenTagHelper.cs similarity index 100% rename from Mvc/Olive.Mvc/TagHelpers/HiddenTagHelper.cs rename to Olive.Mvc/TagHelpers/HiddenTagHelper.cs diff --git a/Mvc/Olive.Mvc/TagHelpers/PrefixIdentificationsTagHelper.cs b/Olive.Mvc/TagHelpers/PrefixIdentificationsTagHelper.cs similarity index 100% rename from Mvc/Olive.Mvc/TagHelpers/PrefixIdentificationsTagHelper.cs rename to Olive.Mvc/TagHelpers/PrefixIdentificationsTagHelper.cs diff --git a/Mvc/Olive.Mvc/TagHelpers/ReplaceIdentificationsTagHelper.cs b/Olive.Mvc/TagHelpers/ReplaceIdentificationsTagHelper.cs similarity index 100% rename from Mvc/Olive.Mvc/TagHelpers/ReplaceIdentificationsTagHelper.cs rename to Olive.Mvc/TagHelpers/ReplaceIdentificationsTagHelper.cs diff --git a/Mvc/Olive.Mvc/TagHelpers/SelectTagHelper.cs b/Olive.Mvc/TagHelpers/SelectTagHelper.cs similarity index 100% rename from Mvc/Olive.Mvc/TagHelpers/SelectTagHelper.cs rename to Olive.Mvc/TagHelpers/SelectTagHelper.cs diff --git a/Mvc/Olive.Mvc/Utilities/AsyncStartupMiddleware.cs b/Olive.Mvc/Utilities/AsyncStartupMiddleware.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/AsyncStartupMiddleware.cs rename to Olive.Mvc/Utilities/AsyncStartupMiddleware.cs diff --git a/Mvc/Olive.Mvc/Utilities/ColumnSelection.cs b/Olive.Mvc/Utilities/ColumnSelection.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ColumnSelection.cs rename to Olive.Mvc/Utilities/ColumnSelection.cs diff --git a/Mvc/Olive.Mvc/Utilities/ColumnSelectionBinder.cs b/Olive.Mvc/Utilities/ColumnSelectionBinder.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ColumnSelectionBinder.cs rename to Olive.Mvc/Utilities/ColumnSelectionBinder.cs diff --git a/Mvc/Olive.Mvc/Utilities/Controller.File.cs b/Olive.Mvc/Utilities/Controller.File.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/Controller.File.cs rename to Olive.Mvc/Utilities/Controller.File.cs diff --git a/Mvc/Olive.Mvc/Utilities/Controller.cs b/Olive.Mvc/Utilities/Controller.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/Controller.cs rename to Olive.Mvc/Utilities/Controller.cs diff --git a/Mvc/Olive.Mvc/Utilities/DatabaseFilters.cs b/Olive.Mvc/Utilities/DatabaseFilters.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/DatabaseFilters.cs rename to Olive.Mvc/Utilities/DatabaseFilters.cs diff --git a/Mvc/Olive.Mvc/Utilities/EmptyListItem.cs b/Olive.Mvc/Utilities/EmptyListItem.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/EmptyListItem.cs rename to Olive.Mvc/Utilities/EmptyListItem.cs diff --git a/Mvc/Olive.Mvc/Utilities/ITaskManager.cs b/Olive.Mvc/Utilities/ITaskManager.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ITaskManager.cs rename to Olive.Mvc/Utilities/ITaskManager.cs diff --git a/Mvc/Olive.Mvc/Utilities/ListSortExpression.cs b/Olive.Mvc/Utilities/ListSortExpression.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ListSortExpression.cs rename to Olive.Mvc/Utilities/ListSortExpression.cs diff --git a/Mvc/Olive.Mvc/Utilities/MenuItem.cs b/Olive.Mvc/Utilities/MenuItem.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/MenuItem.cs rename to Olive.Mvc/Utilities/MenuItem.cs diff --git a/Mvc/Olive.Mvc/Utilities/NotificationAction.cs b/Olive.Mvc/Utilities/NotificationAction.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/NotificationAction.cs rename to Olive.Mvc/Utilities/NotificationAction.cs diff --git a/Mvc/Olive.Mvc/Utilities/OptionalBooleanFilter.cs b/Olive.Mvc/Utilities/OptionalBooleanFilter.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/OptionalBooleanFilter.cs rename to Olive.Mvc/Utilities/OptionalBooleanFilter.cs diff --git a/Mvc/Olive.Mvc/Utilities/PageLifecycleStage.cs b/Olive.Mvc/Utilities/PageLifecycleStage.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/PageLifecycleStage.cs rename to Olive.Mvc/Utilities/PageLifecycleStage.cs diff --git a/Mvc/Olive.Mvc/Utilities/RangeFileResult.cs b/Olive.Mvc/Utilities/RangeFileResult.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/RangeFileResult.cs rename to Olive.Mvc/Utilities/RangeFileResult.cs diff --git a/Mvc/Olive.Mvc/Utilities/RazorPage.cs b/Olive.Mvc/Utilities/RazorPage.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/RazorPage.cs rename to Olive.Mvc/Utilities/RazorPage.cs diff --git a/Mvc/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs b/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs rename to Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs diff --git a/Mvc/Olive.Mvc/Utilities/SecureFileAccessor.cs b/Olive.Mvc/Utilities/SecureFileAccessor.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/SecureFileAccessor.cs rename to Olive.Mvc/Utilities/SecureFileAccessor.cs diff --git a/Mvc/Olive.Mvc/Utilities/Startup.cs b/Olive.Mvc/Utilities/Startup.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/Startup.cs rename to Olive.Mvc/Utilities/Startup.cs diff --git a/Mvc/Olive.Mvc/Utilities/ViewComponent.cs b/Olive.Mvc/Utilities/ViewComponent.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ViewComponent.cs rename to Olive.Mvc/Utilities/ViewComponent.cs diff --git a/Mvc/Olive.Mvc/Utilities/ViewLocationExpander.cs b/Olive.Mvc/Utilities/ViewLocationExpander.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ViewLocationExpander.cs rename to Olive.Mvc/Utilities/ViewLocationExpander.cs diff --git a/Mvc/Olive.Mvc/Utilities/ViewRenderService.cs b/Olive.Mvc/Utilities/ViewRenderService.cs similarity index 100% rename from Mvc/Olive.Mvc/Utilities/ViewRenderService.cs rename to Olive.Mvc/Utilities/ViewRenderService.cs diff --git a/Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj b/Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj index 5aa556cc9..653186980 100644 --- a/Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj +++ b/Olive.Net4x.Compatibility/Olive.Net4x.Compatibility.csproj @@ -60,7 +60,7 @@ ..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - ..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Services/Olive.PDF/IHtml2PdfConverter.cs b/Olive.PDF/IHtml2PdfConverter.cs similarity index 100% rename from Services/Olive.PDF/IHtml2PdfConverter.cs rename to Olive.PDF/IHtml2PdfConverter.cs diff --git a/Services/Olive.PDF/Olive.PDF.csproj b/Olive.PDF/Olive.PDF.csproj similarity index 82% rename from Services/Olive.PDF/Olive.PDF.csproj rename to Olive.PDF/Olive.PDF.csproj index cbf8d9c96..6aefe5372 100644 --- a/Services/Olive.PDF/Olive.PDF.csproj +++ b/Olive.PDF/Olive.PDF.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.PDF.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.PDF.xml 1701;1702;1705;1591;1573;NU1701 @@ -27,10 +27,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Services/Olive.PDF/PdfService.cs b/Olive.PDF/PdfService.cs similarity index 100% rename from Services/Olive.PDF/PdfService.cs rename to Olive.PDF/PdfService.cs diff --git a/Services/Olive.PushNotification/IPushNotificationService.cs b/Olive.PushNotification/IPushNotificationService.cs similarity index 100% rename from Services/Olive.PushNotification/IPushNotificationService.cs rename to Olive.PushNotification/IPushNotificationService.cs diff --git a/Services/Olive.PushNotification/IUserDevice.cs b/Olive.PushNotification/IUserDevice.cs similarity index 100% rename from Services/Olive.PushNotification/IUserDevice.cs rename to Olive.PushNotification/IUserDevice.cs diff --git a/Services/Olive.PushNotification/Olive.PushNotification.csproj b/Olive.PushNotification/Olive.PushNotification.csproj similarity index 87% rename from Services/Olive.PushNotification/Olive.PushNotification.csproj rename to Olive.PushNotification/Olive.PushNotification.csproj index 2b3414f00..394dca0dc 100644 --- a/Services/Olive.PushNotification/Olive.PushNotification.csproj +++ b/Olive.PushNotification/Olive.PushNotification.csproj @@ -2,8 +2,8 @@ netstandard2.0 - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.PushNotification.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.PushNotification.xml Olive.PushNotification 1.0.17 Olive PushNotification (Service) @@ -29,7 +29,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Services/Olive.PushNotification/PushNotificationExtensions.cs b/Olive.PushNotification/PushNotificationExtensions.cs similarity index 100% rename from Services/Olive.PushNotification/PushNotificationExtensions.cs rename to Olive.PushNotification/PushNotificationExtensions.cs diff --git a/Services/Olive.PushNotification/PushNotificationService.cs b/Olive.PushNotification/PushNotificationService.cs similarity index 100% rename from Services/Olive.PushNotification/PushNotificationService.cs rename to Olive.PushNotification/PushNotificationService.cs diff --git a/Services/Olive.SMS/ISmsDispatcher.cs b/Olive.SMS/ISmsDispatcher.cs similarity index 100% rename from Services/Olive.SMS/ISmsDispatcher.cs rename to Olive.SMS/ISmsDispatcher.cs diff --git a/Services/Olive.SMS/ISmsMessage.cs b/Olive.SMS/ISmsMessage.cs similarity index 100% rename from Services/Olive.SMS/ISmsMessage.cs rename to Olive.SMS/ISmsMessage.cs diff --git a/Services/Olive.SMS/ISmsService.cs b/Olive.SMS/ISmsService.cs similarity index 100% rename from Services/Olive.SMS/ISmsService.cs rename to Olive.SMS/ISmsService.cs diff --git a/Services/Olive.SMS/NullSmsDispatcher.cs b/Olive.SMS/NullSmsDispatcher.cs similarity index 100% rename from Services/Olive.SMS/NullSmsDispatcher.cs rename to Olive.SMS/NullSmsDispatcher.cs diff --git a/Services/Olive.SMS/Olive.SMS.csproj b/Olive.SMS/Olive.SMS.csproj similarity index 84% rename from Services/Olive.SMS/Olive.SMS.csproj rename to Olive.SMS/Olive.SMS.csproj index de7c4820b..bfe0f1206 100644 --- a/Services/Olive.SMS/Olive.SMS.csproj +++ b/Olive.SMS/Olive.SMS.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.SMS.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.SMS.xml 1701;1702;1705;1591;1573;NU1701 @@ -29,10 +29,10 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Services/Olive.SMS/SmsExtensions.cs b/Olive.SMS/SmsExtensions.cs similarity index 100% rename from Services/Olive.SMS/SmsExtensions.cs rename to Olive.SMS/SmsExtensions.cs diff --git a/Services/Olive.SMS/SmsSendingEventArgs.cs b/Olive.SMS/SmsSendingEventArgs.cs similarity index 100% rename from Services/Olive.SMS/SmsSendingEventArgs.cs rename to Olive.SMS/SmsSendingEventArgs.cs diff --git a/Services/Olive.SMS/SmsService.cs b/Olive.SMS/SmsService.cs similarity index 100% rename from Services/Olive.SMS/SmsService.cs rename to Olive.SMS/SmsService.cs diff --git a/Mvc/Olive.Security.Aws/DataKeyService.cs b/Olive.Security.Aws/DataKeyService.cs similarity index 100% rename from Mvc/Olive.Security.Aws/DataKeyService.cs rename to Olive.Security.Aws/DataKeyService.cs diff --git a/Mvc/Olive.Security.Aws/KmsDataProtectionProvider.cs b/Olive.Security.Aws/KmsDataProtectionProvider.cs similarity index 100% rename from Mvc/Olive.Security.Aws/KmsDataProtectionProvider.cs rename to Olive.Security.Aws/KmsDataProtectionProvider.cs diff --git a/Mvc/Olive.Security.Aws/Olive.Security.Aws.csproj b/Olive.Security.Aws/Olive.Security.Aws.csproj similarity index 81% rename from Mvc/Olive.Security.Aws/Olive.Security.Aws.csproj rename to Olive.Security.Aws/Olive.Security.Aws.csproj index 4a34f3915..0f97eaf64 100644 --- a/Mvc/Olive.Security.Aws/Olive.Security.Aws.csproj +++ b/Olive.Security.Aws/Olive.Security.Aws.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Security.Aws.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Security.Aws.xml 1701;1702;1705;1591;NU1701 @@ -33,15 +33,15 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Aws.dll + ..\bin\netstandard2.0\Olive.Aws.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Security.dll + ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll false diff --git a/Mvc/Olive.Security.Impersonation/ImpersonationSession.cs b/Olive.Security.Impersonation/ImpersonationSession.cs similarity index 100% rename from Mvc/Olive.Security.Impersonation/ImpersonationSession.cs rename to Olive.Security.Impersonation/ImpersonationSession.cs diff --git a/Mvc/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj b/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj similarity index 75% rename from Mvc/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj rename to Olive.Security.Impersonation/Olive.Security.Impersonation.csproj index 9ba33f82c..706a05b61 100644 --- a/Mvc/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj +++ b/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj @@ -15,8 +15,8 @@ - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Security.Impersonation.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Security.Impersonation.xml 1701;1702;1705;1591;1573;NU1701 @@ -27,23 +27,23 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\bin\netstandard2.0\Olive.Entities.Data.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Security.dll + ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Security/ExternalLoginInfo.cs b/Olive.Security/ExternalLoginInfo.cs similarity index 100% rename from Mvc/Olive.Security/ExternalLoginInfo.cs rename to Olive.Security/ExternalLoginInfo.cs diff --git a/Mvc/Olive.Security/ILoginInfo.cs b/Olive.Security/ILoginInfo.cs similarity index 100% rename from Mvc/Olive.Security/ILoginInfo.cs rename to Olive.Security/ILoginInfo.cs diff --git a/Mvc/Olive.Security/JwtAuthenticateAttribute.cs b/Olive.Security/JwtAuthenticateAttribute.cs similarity index 100% rename from Mvc/Olive.Security/JwtAuthenticateAttribute.cs rename to Olive.Security/JwtAuthenticateAttribute.cs diff --git a/Mvc/Olive.Security/OAuth.cs b/Olive.Security/OAuth.cs similarity index 100% rename from Mvc/Olive.Security/OAuth.cs rename to Olive.Security/OAuth.cs diff --git a/Mvc/Olive.Security/Olive.Mvc.Security.csproj b/Olive.Security/Olive.Mvc.Security.csproj similarity index 78% rename from Mvc/Olive.Security/Olive.Mvc.Security.csproj rename to Olive.Security/Olive.Mvc.Security.csproj index 776fabafb..a6d91e289 100644 --- a/Mvc/Olive.Security/Olive.Mvc.Security.csproj +++ b/Olive.Security/Olive.Mvc.Security.csproj @@ -2,8 +2,8 @@ netcoreapp2.1 - ..\..\@Assemblies - ..\..\@Assemblies\netcoreapp2.1\Olive.Mvc.Security.xml + ..\bin + ..\bin\netcoreapp2.1\Olive.Mvc.Security.xml NU1605 1701;1702;1705;1591;NU1701 Olive.Security @@ -26,19 +26,19 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Encryption.dll + ..\bin\netstandard2.0\Olive.Encryption.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.dll + ..\bin\netcoreapp2.1\Olive.Web.dll false diff --git a/Mvc/Olive.Security/OliveSecurityExtensions.cs b/Olive.Security/OliveSecurityExtensions.cs similarity index 100% rename from Mvc/Olive.Security/OliveSecurityExtensions.cs rename to Olive.Security/OliveSecurityExtensions.cs diff --git a/Mvc/Olive.Security/SymmetricKeyDataProtector.cs b/Olive.Security/SymmetricKeyDataProtector.cs similarity index 100% rename from Mvc/Olive.Security/SymmetricKeyDataProtector.cs rename to Olive.Security/SymmetricKeyDataProtector.cs diff --git a/Mvc/Olive.Web/Extensions/ApiClient.cs b/Olive.Web/Extensions/ApiClient.cs similarity index 100% rename from Mvc/Olive.Web/Extensions/ApiClient.cs rename to Olive.Web/Extensions/ApiClient.cs diff --git a/Mvc/Olive.Web/Extensions/Context.cs b/Olive.Web/Extensions/Context.cs similarity index 100% rename from Mvc/Olive.Web/Extensions/Context.cs rename to Olive.Web/Extensions/Context.cs diff --git a/Mvc/Olive.Web/Extensions/HttpRequest.cs b/Olive.Web/Extensions/HttpRequest.cs similarity index 100% rename from Mvc/Olive.Web/Extensions/HttpRequest.cs rename to Olive.Web/Extensions/HttpRequest.cs diff --git a/Mvc/Olive.Web/Extensions/HttpResponse.cs b/Olive.Web/Extensions/HttpResponse.cs similarity index 100% rename from Mvc/Olive.Web/Extensions/HttpResponse.cs rename to Olive.Web/Extensions/HttpResponse.cs diff --git a/Mvc/Olive.Web/Olive.Web.csproj b/Olive.Web/Olive.Web.csproj similarity index 79% rename from Mvc/Olive.Web/Olive.Web.csproj rename to Olive.Web/Olive.Web.csproj index c102bae73..c314a1e75 100644 --- a/Mvc/Olive.Web/Olive.Web.csproj +++ b/Olive.Web/Olive.Web.csproj @@ -4,8 +4,8 @@ netcoreapp2.1 Olive.Web Olive.Web - ..\..\@Assemblies\ - ..\..\@Assemblies\netcoreapp2.1\Olive.Web.xml + ..\bin\ + ..\bin\netcoreapp2.1\Olive.Web.xml 1701;1702;1705;1591;1573;NU1701 Olive.Web 2.1.50 @@ -25,15 +25,15 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll false - ..\..\@Assemblies\netstandard2.0\Olive.ApiClient.dll + ..\bin\netstandard2.0\Olive.ApiClient.dll false - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\bin\netstandard2.0\Olive.Entities.dll false diff --git a/Mvc/Olive.Web/Utilities/CookieProperty.cs b/Olive.Web/Utilities/CookieProperty.cs similarity index 100% rename from Mvc/Olive.Web/Utilities/CookieProperty.cs rename to Olive.Web/Utilities/CookieProperty.cs diff --git a/Mvc/Olive.Web/Utilities/HttpContextCache.cs b/Olive.Web/Utilities/HttpContextCache.cs similarity index 100% rename from Mvc/Olive.Web/Utilities/HttpContextCache.cs rename to Olive.Web/Utilities/HttpContextCache.cs diff --git a/Mvc/Olive.Web/Utilities/SupportETagCacheAttribute.cs b/Olive.Web/Utilities/SupportETagCacheAttribute.cs similarity index 100% rename from Mvc/Olive.Web/Utilities/SupportETagCacheAttribute.cs rename to Olive.Web/Utilities/SupportETagCacheAttribute.cs diff --git a/Olive.sln b/Olive.sln index 8de6546ca..e7890545a 100644 --- a/Olive.sln +++ b/Olive.sln @@ -8,33 +8,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities", "Olive.Ent EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities.Data", "Olive.Entities.Data\Olive.Entities.Data.csproj", "{35B19C59-D221-47AF-AAC6-F9CEB0953FFB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Web", "Mvc\Olive.Web\Olive.Web.csproj", "{EA922ABB-FF72-4C92-B5BE-C4FEAF5AC168}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Web", "Olive.Web\Olive.Web.csproj", "{EA922ABB-FF72-4C92-B5BE-C4FEAF5AC168}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{943E7871-2EEA-4C97-857B-16443CB240E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Compression", "Olive.Compression\Olive.Compression.csproj", "{AB221943-A14F-4817-BAA6-A6829841EA51}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Compression", "Services\Olive.Compression\Olive.Compression.csproj", "{AB221943-A14F-4817-BAA6-A6829841EA51}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Csv", "Olive.CSV\Olive.Csv.csproj", "{50ABA031-EAD6-4554-AC73-8BCA56C637B2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Csv", "Services\Olive.CSV\Olive.Csv.csproj", "{50ABA031-EAD6-4554-AC73-8BCA56C637B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Export", "Olive.Excel\Olive.Export.csproj", "{E6C2B0FC-8C65-4AD9-A50F-21484D0E9F06}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Export", "Services\Olive.Excel\Olive.Export.csproj", "{E6C2B0FC-8C65-4AD9-A50F-21484D0E9F06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.GeoLocation", "Olive.GeoLocation\Olive.GeoLocation.csproj", "{253531A7-A460-4D61-9A85-A3E29B33AA94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.GeoLocation", "Services\Olive.GeoLocation\Olive.GeoLocation.csproj", "{253531A7-A460-4D61-9A85-A3E29B33AA94}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Globalization", "Olive.Mvc.Globalization\Olive.Globalization.csproj", "{5EE54E7F-07C7-4966-9EFA-5E2252206B77}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Globalization", "Mvc\Olive.Mvc.Globalization\Olive.Globalization.csproj", "{5EE54E7F-07C7-4966-9EFA-5E2252206B77}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.PDF", "Olive.PDF\Olive.PDF.csproj", "{5B7D4B8F-66B2-4A74-A42F-37298CF1878F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.PDF", "Services\Olive.PDF\Olive.PDF.csproj", "{5B7D4B8F-66B2-4A74-A42F-37298CF1878F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.SMS", "Olive.SMS\Olive.SMS.csproj", "{2CCA47DA-038F-4C63-8E7F-9F4A9296BB44}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.SMS", "Services\Olive.SMS\Olive.SMS.csproj", "{2CCA47DA-038F-4C63-8E7F-9F4A9296BB44}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Drawing", "Olive.Drawing\Olive.Drawing.csproj", "{55390C42-F8DE-4089-B079-74E18714236D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Drawing", "Services\Olive.Drawing\Olive.Drawing.csproj", "{55390C42-F8DE-4089-B079-74E18714236D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.IpFilter", "Olive.Mvc.IpFilter\Olive.Mvc.IpFilter.csproj", "{816FFC81-38E0-442C-8236-742551AC8AFC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.IpFilter", "Mvc\Olive.Mvc.IpFilter\Olive.Mvc.IpFilter.csproj", "{816FFC81-38E0-442C-8236-742551AC8AFC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Impersonation", "Olive.Security.Impersonation\Olive.Security.Impersonation.csproj", "{E66479DB-792B-4A2F-AA03-DEAAB128CE94}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Impersonation", "Mvc\Olive.Security.Impersonation\Olive.Security.Impersonation.csproj", "{E66479DB-792B-4A2F-AA03-DEAAB128CE94}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Testing", "Olive.Mvc.Testing\Olive.Mvc.Testing.csproj", "{4C446033-19E3-4D88-B4A2-AE2D5190AF41}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Testing", "Mvc\Olive.Mvc.Testing\Olive.Mvc.Testing.csproj", "{4C446033-19E3-4D88-B4A2-AE2D5190AF41}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc", "Mvc\Olive.Mvc\Olive.Mvc.csproj", "{08ADF968-0FFF-4E3C-88EC-E04E2FA94D13}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc", "Olive.Mvc\Olive.Mvc.csproj", "{08ADF968-0FFF-4E3C-88EC-E04E2FA94D13}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mvc.RemovalCandidates", "Mvc.RemovalCandidates\Mvc.RemovalCandidates.csproj", "{D6CB3117-1CB6-4263-AE89-37483A0379B9}" EndProject @@ -46,9 +44,27 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities.Data.Postgre EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{E51A8EF6-624C-45C9-AC5C-6DE92BF1825D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.BlobAws", "Services\Olive.Blob.Aws\Olive.BlobAws.csproj", "{52AF0D90-E65E-450C-877B-95B831B35694}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.BlobAws", "Olive.Blob.Aws\Olive.BlobAws.csproj", "{52AF0D90-E65E-450C-877B-95B831B35694}" EndProject Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Olive.MvcJs", "Olive.MvcJs\", "{E0D4B0CD-4351-400C-8952-11C2F1318C6F}" + ProjectSection(WebsiteProperties) = preProject + TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" + Debug.AspNetCompiler.VirtualPath = "/localhost_61844" + Debug.AspNetCompiler.PhysicalPath = "Olive.MvcJs\" + Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_61844\" + Debug.AspNetCompiler.Updateable = "true" + Debug.AspNetCompiler.ForceOverwrite = "true" + Debug.AspNetCompiler.FixedNames = "false" + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.VirtualPath = "/localhost_61844" + Release.AspNetCompiler.PhysicalPath = "Olive.MvcJs\" + Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_61844\" + Release.AspNetCompiler.Updateable = "true" + Release.AspNetCompiler.ForceOverwrite = "true" + Release.AspNetCompiler.FixedNames = "false" + Release.AspNetCompiler.Debug = "False" + VWDPort = "61844" + EndProjectSection ProjectSection(WebsiteProperties) = preProject TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0" Debug.AspNetCompiler.VirtualPath = "/localhost_61844" @@ -71,25 +87,21 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Olive.MvcJs", "Olive.MvcJs\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities.Data.SQLite", "Olive.Entities.Data.SQLite\Olive.Entities.Data.SQLite.csproj", "{EE70F844-B284-42D1-8565-45B153727A1B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.PushNotification", "Services\Olive.PushNotification\Olive.PushNotification.csproj", "{7FF67EEC-A5F7-46C3-BE96-0CF1A76706B6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Security", "Mvc\Olive.Security\Olive.Mvc.Security.csproj", "{2A273AE2-5D6A-491A-809B-71764F35281E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Auth0", "Mvc\Olive.Mvc.Security.Auth0\Olive.Security.Auth0.csproj", "{0019E42E-F830-439C-9911-DF36142BACB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.PushNotification", "Olive.PushNotification\Olive.PushNotification.csproj", "{7FF67EEC-A5F7-46C3-BE96-0CF1A76706B6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.ApiClient", "Integration\Olive.ApiClient\Olive.ApiClient.csproj", "{3CFA0862-652F-493B-B06F-6873A0B52271}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Security", "Olive.Security\Olive.Mvc.Security.csproj", "{2A273AE2-5D6A-491A-809B-71764F35281E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Hangfire", "Mvc\Olive.Hangfire\Olive.Hangfire.csproj", "{77A2DD2F-8249-4140-B9D4-7F80FECAB405}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Auth0", "Olive.Mvc.Security.Auth0\Olive.Security.Auth0.csproj", "{0019E42E-F830-439C-9911-DF36142BACB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Microservices", "Integration\Olive.Microservices\Olive.Microservices.csproj", "{6D544D10-9E8B-47E8-AB51-D6F504B1F5EF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.ApiClient", "Olive.ApiClient\Olive.ApiClient.csproj", "{3CFA0862-652F-493B-B06F-6873A0B52271}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.ApiProxyGenerator", "Integration\Olive.ApiProxyGenerator\Olive.ApiProxyGenerator.csproj", "{81877296-65EB-4F57-8B58-6B3982ADF05B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Hangfire", "Olive.Hangfire\Olive.Hangfire.csproj", "{77A2DD2F-8249-4140-B9D4-7F80FECAB405}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mvc", "Mvc", "{4EE1A9FA-1435-417C-B407-77E652959CE1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Microservices", "Olive.Microservices\Olive.Microservices.csproj", "{6D544D10-9E8B-47E8-AB51-D6F504B1F5EF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{E2BA5BD4-58EF-4031-9203-10FD08B0AE9E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.ApiProxyGenerator", "Olive.ApiProxyGenerator\Olive.ApiProxyGenerator.csproj", "{81877296-65EB-4F57-8B58-6B3982ADF05B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Email", "Mvc\Olive.Email\Olive.Email.csproj", "{6C81363C-E71F-4999-80A4-AF42FAF69D04}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Email", "Olive.Email\Olive.Email.csproj", "{6C81363C-E71F-4999-80A4-AF42FAF69D04}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PublishToLocalNuget", "Utils\PublishToLocalNuget\PublishToLocalNuget.csproj", "{4E848AF4-85B4-4B47-82FB-C78C337573C9}" EndProject @@ -118,19 +130,17 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "docs", "docs\", "{D3A7C778- SlnRelativePath = "docs\" EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Paging", "Mvc\Olive.Mvc.Paging\Olive.Mvc.Paging.csproj", "{A504705A-BAAA-447D-A15F-C99BEFF296F7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Paging", "Olive.Mvc.Paging\Olive.Mvc.Paging.csproj", "{A504705A-BAAA-447D-A15F-C99BEFF296F7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Aws", "Mvc\Olive.Security.Aws\Olive.Security.Aws.csproj", "{012CB6E2-AA00-4BEB-93A4-B6BBF5770341}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Security.Aws", "Olive.Security.Aws\Olive.Security.Aws.csproj", "{012CB6E2-AA00-4BEB-93A4-B6BBF5770341}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Aws", "Services\Olive.Aws\Olive.Aws.csproj", "{64B3426B-0ECF-4478-AD84-F29E5030AF15}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Aws", "Olive.Aws\Olive.Aws.csproj", "{64B3426B-0ECF-4478-AD84-F29E5030AF15}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Encryption", "Services\Olive.Encryption\Olive.Encryption.csproj", "{AC924CEE-42AD-4E5C-BDEA-D100DDBF9341}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Encryption", "Olive.Encryption\Olive.Encryption.csproj", "{AC924CEE-42AD-4E5C-BDEA-D100DDBF9341}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Aws.Ses", "Olive.Aws.Ses\Olive.Aws.Ses.csproj", "{AA08CBC6-3923-491D-A9E3-22BA46E56DA1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Entities", "Entities", "{29DB8290-B5E9-41A3-9B57-E778694C59FC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities.Cache.Redis", "Entities\Olive.Entities.Cache.Redis\Olive.Entities.Cache.Redis.csproj", "{C001382C-3FB6-4CAA-8A28-D469D867B7ED}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Entities.Cache.Redis", "Olive.Entities.Cache.Redis\Olive.Entities.Cache.Redis.csproj", "{C001382C-3FB6-4CAA-8A28-D469D867B7ED}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{7104C604-DB4B-4766-A61D-17FA1A57EFDD}" EndProject @@ -158,6 +168,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject nuget.exe = nuget.exe EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -367,45 +378,13 @@ Global {53AE4974-CFE9-4FAD-A908-99AE5AEB9D41}.Debug|Any CPU.Build.0 = Debug|Any CPU {53AE4974-CFE9-4FAD-A908-99AE5AEB9D41}.Release|Any CPU.ActiveCfg = Release|Any CPU {53AE4974-CFE9-4FAD-A908-99AE5AEB9D41}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB3726E-D43A-4801-B692-309631C90C5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB3726E-D43A-4801-B692-309631C90C5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB3726E-D43A-4801-B692-309631C90C5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB3726E-D43A-4801-B692-309631C90C5D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EA922ABB-FF72-4C92-B5BE-C4FEAF5AC168} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {AB221943-A14F-4817-BAA6-A6829841EA51} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {50ABA031-EAD6-4554-AC73-8BCA56C637B2} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {E6C2B0FC-8C65-4AD9-A50F-21484D0E9F06} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {253531A7-A460-4D61-9A85-A3E29B33AA94} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {5EE54E7F-07C7-4966-9EFA-5E2252206B77} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {5B7D4B8F-66B2-4A74-A42F-37298CF1878F} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {2CCA47DA-038F-4C63-8E7F-9F4A9296BB44} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {55390C42-F8DE-4089-B079-74E18714236D} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {816FFC81-38E0-442C-8236-742551AC8AFC} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {E66479DB-792B-4A2F-AA03-DEAAB128CE94} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {4C446033-19E3-4D88-B4A2-AE2D5190AF41} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {08ADF968-0FFF-4E3C-88EC-E04E2FA94D13} = {4EE1A9FA-1435-417C-B407-77E652959CE1} {D6CB3117-1CB6-4263-AE89-37483A0379B9} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} - {52AF0D90-E65E-450C-877B-95B831B35694} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {7FF67EEC-A5F7-46C3-BE96-0CF1A76706B6} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {2A273AE2-5D6A-491A-809B-71764F35281E} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {0019E42E-F830-439C-9911-DF36142BACB0} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {3CFA0862-652F-493B-B06F-6873A0B52271} = {E2BA5BD4-58EF-4031-9203-10FD08B0AE9E} - {77A2DD2F-8249-4140-B9D4-7F80FECAB405} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {6D544D10-9E8B-47E8-AB51-D6F504B1F5EF} = {E2BA5BD4-58EF-4031-9203-10FD08B0AE9E} - {81877296-65EB-4F57-8B58-6B3982ADF05B} = {E2BA5BD4-58EF-4031-9203-10FD08B0AE9E} - {6C81363C-E71F-4999-80A4-AF42FAF69D04} = {4EE1A9FA-1435-417C-B407-77E652959CE1} {4E848AF4-85B4-4B47-82FB-C78C337573C9} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} - {A504705A-BAAA-447D-A15F-C99BEFF296F7} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {012CB6E2-AA00-4BEB-93A4-B6BBF5770341} = {4EE1A9FA-1435-417C-B407-77E652959CE1} - {64B3426B-0ECF-4478-AD84-F29E5030AF15} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {AC924CEE-42AD-4E5C-BDEA-D100DDBF9341} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {AA08CBC6-3923-491D-A9E3-22BA46E56DA1} = {943E7871-2EEA-4C97-857B-16443CB240E6} - {C001382C-3FB6-4CAA-8A28-D469D867B7ED} = {29DB8290-B5E9-41A3-9B57-E778694C59FC} {B67F7B8C-3B04-45AC-8D5A-442EC14C68FC} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {CF8E08B3-684E-4A1A-8141-5FDE29B2FA11} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {E613709B-D776-41D5-BDBF-5386B6DB186B} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} @@ -415,7 +394,6 @@ Global {A0B60121-F4AB-4D29-8863-C3DE2DCABEE1} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {641E5318-DADD-48AE-9DBD-0BF74883D577} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {126292EE-733D-4C27-8343-E38A310B72F1} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} - {6FB3726E-D43A-4801-B692-309631C90C5D} = {E2BA5BD4-58EF-4031-9203-10FD08B0AE9E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B8459027-6FAF-42E6-B8A8-4887D7730704} diff --git a/Olive/Olive.csproj b/Olive/Olive.csproj index f5febe29c..4ac34f47f 100644 --- a/Olive/Olive.csproj +++ b/Olive/Olive.csproj @@ -1,8 +1,8 @@ netstandard2.0 - ..\@Assemblies\ - ..\@Assemblies\netstandard2.0\Olive.xml + ..\bin\ + ..\bin\netstandard2.0\Olive.xml 1701;1702;1705;1591;1573;NU1701 Olive Olive diff --git a/OliveVSIX/Key.snk b/OliveVSIX/Key.snk deleted file mode 100644 index 00963ed6c..000000000 Binary files a/OliveVSIX/Key.snk and /dev/null differ diff --git a/OliveVSIX/NugetPacker/NugetPacker.cs b/OliveVSIX/NugetPacker/NugetPacker.cs deleted file mode 100644 index f97d0acbe..000000000 --- a/OliveVSIX/NugetPacker/NugetPacker.cs +++ /dev/null @@ -1,112 +0,0 @@ -using System; -using System.ComponentModel.Design; -using System.Globalization; -using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; - -namespace OliveVSIX.NugetPacker -{ - /// - /// Command handler - /// - internal sealed class NugetPacker - { - bool ExceptionOccurred; - - /// - /// Command ID. - /// - public const int CommandId = 0x0100; - - /// - /// Command menu group (command set GUID). - /// - public static readonly Guid CommandSet = new Guid("090581b5-cfbb-40d7-9ff4-bdc7f81edef5"); - - /// - /// VS Package that provides this command, not null. - /// - readonly Package package; - - /// - /// Initializes a new instance of the class. - /// Adds our command handlers for menu (commands must exist in the command table file) - /// - /// Owner package, not null. - NugetPacker(Package package) - { - this.package = package ?? throw new ArgumentNullException("package"); - - if (ServiceProvider.GetService(typeof(IMenuCommandService)) is OleMenuCommandService commandService) - { - var menuCommandID = new CommandID(CommandSet, CommandId); - var menuItem = new MenuCommand(MenuItemCallback, menuCommandID); - commandService.AddCommand(menuItem); - - NugetPackerLogic.OnCompleted += NugetPackerLogic_OnCompleted; - NugetPackerLogic.OnException += NugetPackerLogic_OnException; - } - } - - void NugetPackerLogic_OnException(object sender, Exception arg) - { - ExceptionOccurred = true; - - VsShellUtilities.ShowMessageBox( - ServiceProvider, - arg.Message, - arg.GetType().ToString(), - OLEMSGICON.OLEMSGICON_CRITICAL, - OLEMSGBUTTON.OLEMSGBUTTON_OK, - OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST); - } - - void NugetPackerLogic_OnCompleted(object sender, EventArgs e) - { - VsShellUtilities.ShowMessageBox( - ServiceProvider, - ExceptionOccurred ? "The process completed with error(s)." : "The selected projects are updated.", - "Nuget updater", - OLEMSGICON.OLEMSGICON_INFO, - OLEMSGBUTTON.OLEMSGBUTTON_OK, - OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST); - } - - /// - /// Gets the instance of the command. - /// - public static NugetPacker Instance - { - get; - private set; - } - - /// - /// Gets the service provider from the owner package. - /// - IServiceProvider ServiceProvider => package; - - /// - /// Initializes the singleton instance of the command. - /// - /// Owner package, not null. - public static void Initialize(Package package) - { - Instance = new NugetPacker(package); - } - - /// - /// This function is the callback used to execute the command when the menu item is clicked. - /// See the constructor to see how the menu item is associated with this function using - /// OleMenuCommandService service and MenuCommand class. - /// - /// Event sender. - /// Event args. - void MenuItemCallback(object sender, EventArgs e) - { - ExceptionOccurred = false; - var dte2 = Package.GetGlobalService(typeof(EnvDTE.DTE)) as EnvDTE80.DTE2; - NugetPackerLogic.Pack(dte2); - } - } -} diff --git a/OliveVSIX/NugetPacker/NugetPackerLogic.cs b/OliveVSIX/NugetPacker/NugetPackerLogic.cs deleted file mode 100644 index e0bfc5144..000000000 --- a/OliveVSIX/NugetPacker/NugetPackerLogic.cs +++ /dev/null @@ -1,210 +0,0 @@ -using EnvDTE; -using EnvDTE80; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Xml; - -namespace OliveVSIX.NugetPacker -{ - public delegate void ExceptionHandler(object sender, Exception arg); - - static class NugetPackerLogic - { - const string NUSPEC_FILE_NAME = "Package.nuspec"; - const string NUGET_FILE_NAME = "nuget.exe"; - const string OUTPUT_FOLDER = "NugetPackages"; -#pragma warning disable GCop412 // Never hardcode a path or drive name in code. Get the application path programmatically and use relative path. Use “AppDomain.CurrentDomain.GetPath” to get the physical path. - const string API_KEY_CONTAINING_FILE = @"C:\Projects\NUGET-Publish-Key.txt"; -#pragma warning restore GCop412 // Never hardcode a path or drive name in code. Get the application path programmatically and use relative path. Use “AppDomain.CurrentDomain.GetPath” to get the physical path. - - static DTE2 Dte2; - static string NugetExe; - static string SolutionPath; - static string ApiKey; - static string NugetPackagesFolder; - - static System.Threading.Thread Thread; - - public static event EventHandler OnCompleted; - public static event ExceptionHandler OnException; - - public static void Pack(DTE2 dte2) - { - Dte2 = dte2; - - SolutionPath = Path.GetDirectoryName(Dte2.Solution.FullName); - NugetExe = Path.Combine(SolutionPath, NUGET_FILE_NAME); - ApiKey = File.ReadAllText(API_KEY_CONTAINING_FILE); - NugetPackagesFolder = Path.Combine(SolutionPath, OUTPUT_FOLDER); - - var start = new System.Threading.ThreadStart(() => - { - try - { - foreach (var item in GetSelectedProjectPath()) - PackSingleProject(item); - } - catch (Exception exception) - { - InvokeException(exception); - } - - OnCompleted?.Invoke(null, EventArgs.Empty); - }); - - Thread = new System.Threading.Thread(start) { IsBackground = true }; - Thread.Start(); - } - - static void InvokeException(Exception exception) => OnException?.Invoke(null, exception); - - static void PackSingleProject(Project proj) - { - var projectPath = Path.GetDirectoryName(proj.FullName); - var nuspecAddress = Path.Combine(projectPath, NUSPEC_FILE_NAME); - - if (!File.Exists(nuspecAddress)) - { - GenerateNugetFromVSProject(proj.FileName); - } - else - { - GenerateNugetFromNuspec(nuspecAddress); - } - } - - static void GenerateNugetFromNuspec(string nuspecAddress) - { - var packageFilename = UpdateNuspecVersionThenReturnPackageName(nuspecAddress); - - if (TryPackNuget(nuspecAddress, out string packingMessage)) - { - if (!TryPush(packageFilename, out string pushingMessage)) - InvokeException(new Exception(pushingMessage)); - } - else - InvokeException(new Exception(packingMessage)); - } - - static void GenerateNugetFromVSProject(string projectAddress) - { - var packageFilename = UpdateVisualStudioPackageVersionThenReturnPackageName(projectAddress); - - if (TryPackDotnet(projectAddress, out string packingMessageDotnet)) - { - if (!TryPush(packageFilename, out string pushingMessage)) - InvokeException(new Exception(pushingMessage)); - } - else - InvokeException(new Exception(packingMessageDotnet)); - } - - static bool TryPush(string packageFilename, out string message) - { - if (!ExecuteNuget($"push \"{NugetPackagesFolder}\\{packageFilename}\" {ApiKey} -NonInteractive -Source https://www.nuget.org/api/v2/package", out message, NugetExe)) - return false; - - if (!ExecuteNuget($"push \"{NugetPackagesFolder}\\{packageFilename}\" thisIsMyApiKey -NonInteractive -Source http://nuget.geeksms.uat.co/nuget", out message, NugetExe)) - return false; - - return true; - } - - static bool TryPackNuget(string nuspecAddress, out string message) => - ExecuteNuget($"pack \"{nuspecAddress}\" -OutputDirectory \"{NugetPackagesFolder}\"", out message, NugetExe); - - static bool TryPackDotnet(string projectAddress, out string message) - { - ExecuteNuget($"build \"{projectAddress}\"", out message, "dotnet"); - return ExecuteNuget($"pack \"{projectAddress}\" -o \"{NugetPackagesFolder}\"", out message, "dotnet"); - } - - static bool ExecuteNuget(string arguments, out string message, string processStart) - { - var startInfo = new ProcessStartInfo(processStart) - { - Arguments = arguments, - RedirectStandardOutput = true, - RedirectStandardError = true, - CreateNoWindow = true, - UseShellExecute = false, - WindowStyle = ProcessWindowStyle.Hidden - }; - - var process = System.Diagnostics.Process.Start(startInfo); - - process.WaitForExit(); - - if (process.ExitCode == 0) - { - message = null; - return true; - } - else - { - message = $"{arguments}:\r\n{process.StandardError.ReadToEnd()}"; - return false; - } - } - - static string UpdateNuspecVersionThenReturnPackageName(string nuspecAddress) - { - var doc = new XmlDocument(); - doc.Load(nuspecAddress); - - // TODO: This is not a proper way to access to xml nodes. It is just a in rush code. - var idNode = doc.ChildNodes[1].ChildNodes[0].ChildNodes[0]; - var versionNode = doc.ChildNodes[1].ChildNodes[0].ChildNodes[1]; - - var versionParts = versionNode.InnerText.Split('.'); - var minorPart = int.Parse(versionParts.LastOrDefault()) + 1; - - var newVersion = string.Empty; - for (var index = 0; index < versionParts.Length - 1; index++) - newVersion += $"{versionParts[index]}."; - - versionNode.InnerText = $"{newVersion}{minorPart}"; - - doc.Save(nuspecAddress); - - return $"{idNode.InnerText}.{versionNode.InnerText}.nupkg"; - } - - static string UpdateVisualStudioPackageVersionThenReturnPackageName(string projectAddress) - { - var doc = new XmlDocument(); - doc.Load(projectAddress); - - var projectFile = doc.SelectSingleNode("Project/PropertyGroup"); - var idNode = projectFile.SelectSingleNode("PackageId"); - var versionNode = projectFile.SelectSingleNode("Version"); - - var versionParts = versionNode.InnerText.Split('.'); - var minorPart = int.Parse(versionParts.LastOrDefault()) + 1; - - var newVersion = string.Empty; - for (var index = 0; index < versionParts.Length - 1; index++) - newVersion += $"{versionParts[index]}."; - - versionNode.InnerText = $"{newVersion}{minorPart}"; - - doc.Save(projectAddress); - - return $"{idNode.InnerText}.{versionNode.InnerText}.nupkg"; - } - - static IEnumerable GetSelectedProjectPath() - { - var uih = Dte2.ToolWindows.SolutionExplorer; - var selectedItems = (Array)uih.SelectedItems; - - if (selectedItems != null) - foreach (UIHierarchyItem selItem in selectedItems) - if (selItem.Object is Project proj) - yield return proj; - } - } -} diff --git a/OliveVSIX/NugetPacker/NugetPackerPackage.cs b/OliveVSIX/NugetPacker/NugetPackerPackage.cs deleted file mode 100644 index 250cb1b0d..000000000 --- a/OliveVSIX/NugetPacker/NugetPackerPackage.cs +++ /dev/null @@ -1,69 +0,0 @@ -using System; -using System.ComponentModel.Design; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Globalization; -using System.Runtime.InteropServices; -using Microsoft.VisualStudio; -using Microsoft.VisualStudio.OLE.Interop; -using Microsoft.VisualStudio.Shell; -using Microsoft.VisualStudio.Shell.Interop; -using Microsoft.Win32; - -namespace OliveVSIX.NugetPacker -{ - /// - /// This is the class that implements the package exposed by this assembly. - /// - /// - /// - /// The minimum requirement for a class to be considered a valid package for Visual Studio - /// is to implement the IVsPackage interface and register itself with the shell. - /// This package uses the helper classes defined inside the Managed Package Framework (MPF) - /// to do it: it derives from the Package class that provides the implementation of the - /// IVsPackage interface and uses the registration attributes defined in the framework to - /// register itself and its components with the shell. These attributes tell the pkgdef creation - /// utility what data to put into .pkgdef file. - /// - /// - /// To get loaded into VS, the package must be referred by <Asset Type="Microsoft.VisualStudio.VsPackage" ...> in .vsixmanifest file. - /// - /// - [PackageRegistration(UseManagedResourcesOnly = true)] - [InstalledProductRegistration("#110", "#112", "1.0", IconResourceID = 400)] // Info on this package for Help/About - [ProvideMenuResource("Menus.ctmenu", 1)] - [Guid(NugetPackerPackage.PackageGuidString)] - [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")] - public sealed class NugetPackerPackage : Package - { - /// - /// NugetPackerPackage GUID string. - /// - public const string PackageGuidString = "aebcdf85-651a-4513-8f1c-a706edd15c5c"; - - /// - /// Initializes a new instance of the class. - /// - public NugetPackerPackage() - { - // Inside this method you can place any initialization code that does not require - // any Visual Studio service because at this point the package object is created but - // not sited yet inside Visual Studio environment. The place to do all the other - // initialization is the Initialize method. - } - - #region Package Members - - /// - /// Initialization of the package; this method is called right after the package is sited, so this is the place - /// where you can put all the initialization code that rely on services provided by VisualStudio. - /// - protected override void Initialize() - { - NugetPacker.Initialize(this); - base.Initialize(); - } - - #endregion - } -} diff --git a/OliveVSIX/NugetPacker/NugetPackerPackage.vsct b/OliveVSIX/NugetPacker/NugetPackerPackage.vsct deleted file mode 100644 index e6a6989d5..000000000 --- a/OliveVSIX/NugetPacker/NugetPackerPackage.vsct +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/OliveVSIX/NugetPacker/Resources/NugetPacker.png b/OliveVSIX/NugetPacker/Resources/NugetPacker.png deleted file mode 100644 index b22d975cb..000000000 Binary files a/OliveVSIX/NugetPacker/Resources/NugetPacker.png and /dev/null differ diff --git a/OliveVSIX/NugetPacker/VSPackage.resx b/OliveVSIX/NugetPacker/VSPackage.resx deleted file mode 100644 index 9c5cd70bd..000000000 --- a/OliveVSIX/NugetPacker/VSPackage.resx +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NugetPacker Extension - - - NugetPacker Visual Studio Extension Detailed Info - - \ No newline at end of file diff --git a/OliveVSIX/OliveVSIX.csproj b/OliveVSIX/OliveVSIX.csproj deleted file mode 100644 index 4ccff8175..000000000 --- a/OliveVSIX/OliveVSIX.csproj +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - 15.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - true - - - true - - - Key.snk - - - - Debug - AnyCPU - 2.0 - {82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {83FFCB26-B836-4E43-8F16-3FC0B29A7572} - Library - Properties - OliveVSIX - OliveVSIX - v4.6.1 - true - true - true - true - true - false - Program - $(DevEnvDir)devenv.exe - /rootsuffix Exp - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - Designer - - - - - Menus.ctmenu - Designer - - - Always - true - - - - - False - - - False - - - False - - - False - - - - False - - - packages\Microsoft.VisualStudio.CoreUtility.15.0.26606\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - packages\Microsoft.VisualStudio.Imaging.15.0.26606\lib\net45\Microsoft.VisualStudio.Imaging.dll - True - - - packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - packages\Microsoft.VisualStudio.Shell.15.0.15.0.26606\lib\Microsoft.VisualStudio.Shell.15.0.dll - True - - - packages\Microsoft.VisualStudio.Shell.Framework.15.0.26606\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll - True - - - packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - True - packages\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.15.0.26606\lib\net20\Microsoft.VisualStudio.Shell.Interop.15.3.DesignTime.dll - True - - - packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - packages\Microsoft.VisualStudio.Threading.15.3.23\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - packages\Microsoft.VisualStudio.Utilities.15.0.26606\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll - True - - - False - - - - - - - - - - - true - VSPackage - Designer - - - - - - - - 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/OliveVSIX/OliveVSIX.sln b/OliveVSIX/OliveVSIX.sln deleted file mode 100644 index 4f0f15c20..000000000 --- a/OliveVSIX/OliveVSIX.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2037 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OliveVSIX", "OliveVSIX.csproj", "{83FFCB26-B836-4E43-8F16-3FC0B29A7572}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {83FFCB26-B836-4E43-8F16-3FC0B29A7572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83FFCB26-B836-4E43-8F16-3FC0B29A7572}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83FFCB26-B836-4E43-8F16-3FC0B29A7572}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83FFCB26-B836-4E43-8F16-3FC0B29A7572}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CA54BE0B-66D7-466D-8C02-893BCE9B259A} - EndGlobalSection -EndGlobal diff --git a/OliveVSIX/Properties/AssemblyInfo.cs b/OliveVSIX/Properties/AssemblyInfo.cs deleted file mode 100644 index b2ea00f8c..000000000 --- a/OliveVSIX/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,33 +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("OliveVSIX")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OliveVSIX")] -[assembly: AssemblyCopyright("")] -[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)] - -// 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/OliveVSIX/Resources/Olive.png b/OliveVSIX/Resources/Olive.png deleted file mode 100644 index c29070869..000000000 Binary files a/OliveVSIX/Resources/Olive.png and /dev/null differ diff --git a/OliveVSIX/packages.config b/OliveVSIX/packages.config deleted file mode 100644 index 76e7edd94..000000000 --- a/OliveVSIX/packages.config +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/OliveVSIX/source.extension.vsixmanifest b/OliveVSIX/source.extension.vsixmanifest deleted file mode 100644 index 0dfaa5972..000000000 --- a/OliveVSIX/source.extension.vsixmanifest +++ /dev/null @@ -1,26 +0,0 @@ - - - - - OliveVSIX - Empty VSIX Project. - https://github.com/Geeksltd/Olive - Resources\Olive.png - Resources\Olive.png - - - - - - - - - - - - - - - - - diff --git a/Services/Olive.CSV/Olive.Csv.csproj b/Services/Olive.CSV/Olive.Csv.csproj deleted file mode 100644 index 5dfd07418..000000000 --- a/Services/Olive.CSV/Olive.Csv.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - netstandard2.0 - Olive.Csv - Olive.Csv - Olive.CSV - 1.0.24 - Olive CSV (Service) - Geeks Ltd - https://github.com/Geeksltd/Olive - http://licensing.msharp.co.uk/Images/OliveComponent.png - Copyright ©2018 Geeks Ltd - All rights reserved. - Olive Framework - true - - - - ..\..\@Assemblies\ - ..\..\@Assemblies\netstandard2.0\Olive.Csv.xml - 1701;1702;1705;1591;1573;NU1701 - - - - - - - - - - - ..\..\@Assemblies\netstandard2.0\Olive.dll - - - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll - - - - - - - - \ No newline at end of file diff --git a/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj b/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj index e429c9531..323c77b17 100644 --- a/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj +++ b/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj @@ -29,7 +29,7 @@ - ..\..\@Assemblies\netcoreapp2.1\Olive.Email.dll + ..\..\bin\netcoreapp2.1\Olive.Email.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll diff --git a/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj b/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj index faa295d7b..dac747011 100644 --- a/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj +++ b/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj @@ -29,7 +29,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.MySql.dll + ..\..\bin\netstandard2.0\Olive.Entities.Data.MySql.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll diff --git a/Tests/Olive.Entities.Data.SqlServer.Tests/Olive.Entities.Data.SqlServer.Tests.csproj b/Tests/Olive.Entities.Data.SqlServer.Tests/Olive.Entities.Data.SqlServer.Tests.csproj index 66b2b66ab..11b221afe 100644 --- a/Tests/Olive.Entities.Data.SqlServer.Tests/Olive.Entities.Data.SqlServer.Tests.csproj +++ b/Tests/Olive.Entities.Data.SqlServer.Tests/Olive.Entities.Data.SqlServer.Tests.csproj @@ -33,16 +33,16 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\..\bin\netstandard2.0\Olive.Entities.Data.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.SqlServer.dll + ..\..\bin\netstandard2.0\Olive.Entities.Data.SqlServer.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll diff --git a/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj b/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj index 5c5fc8efb..b30e6a261 100644 --- a/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj +++ b/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj @@ -30,7 +30,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.GeoLocation.dll + ..\..\bin\netstandard2.0\Olive.GeoLocation.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll diff --git a/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj b/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj index 846be73e2..daaba59fa 100644 --- a/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj +++ b/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj @@ -30,7 +30,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.PushNotification.dll + ..\..\bin\netstandard2.0\Olive.PushNotification.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll diff --git a/Tests/Olive.SMS.Tests/Olive.SMS.Tests.csproj b/Tests/Olive.SMS.Tests/Olive.SMS.Tests.csproj index 2785c6796..ced6b55ae 100644 --- a/Tests/Olive.SMS.Tests/Olive.SMS.Tests.csproj +++ b/Tests/Olive.SMS.Tests/Olive.SMS.Tests.csproj @@ -34,16 +34,16 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.SMS.dll + ..\..\bin\netstandard2.0\Olive.SMS.dll ..\Olive.Tests\bin\Debug\netcoreapp2.1\Olive.Tests.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\..\bin\netstandard2.0\Olive.Entities.dll diff --git a/Tests/Olive.Tests/Olive.Tests.csproj b/Tests/Olive.Tests/Olive.Tests.csproj index 01c7fbdb7..1259caccb 100644 --- a/Tests/Olive.Tests/Olive.Tests.csproj +++ b/Tests/Olive.Tests/Olive.Tests.csproj @@ -24,13 +24,13 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\..\bin\netstandard2.0\Olive.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.dll + ..\..\bin\netstandard2.0\Olive.Entities.dll - ..\..\@Assemblies\netstandard2.0\Olive.Entities.Data.dll + ..\..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Utils/MSharp.Build/MSharp.Build.csproj b/Utils/MSharp.Build/MSharp.Build.csproj index 07760f39a..f492a74b2 100644 --- a/Utils/MSharp.Build/MSharp.Build.csproj +++ b/Utils/MSharp.Build/MSharp.Build.csproj @@ -31,7 +31,7 @@ - ..\..\@Assemblies\netstandard2.0\Olive.dll + ..\bin\netstandard2.0\Olive.dll diff --git a/Utils/PublishToLocalNuget/PublishToLocalNuget.csproj b/Utils/PublishToLocalNuget/PublishToLocalNuget.csproj index ec92ed4e3..0eb80670b 100644 --- a/Utils/PublishToLocalNuget/PublishToLocalNuget.csproj +++ b/Utils/PublishToLocalNuget/PublishToLocalNuget.csproj @@ -19,7 +19,7 @@ true full false - ..\..\%40Assemblies\ + ..\bin\ DEBUG;TRACE prompt 4 @@ -35,92 +35,92 @@ - ..\..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll + ..\packages\Microsoft.CodeAnalysis.Common.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.dll - ..\..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll + ..\packages\Microsoft.CodeAnalysis.CSharp.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.dll - ..\..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll + ..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.CSharp.Workspaces.dll - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll + ..\packages\Microsoft.CodeAnalysis.VisualBasic.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.dll - ..\..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll + ..\packages\Microsoft.CodeAnalysis.VisualBasic.Workspaces.2.8.2\lib\netstandard1.3\Microsoft.CodeAnalysis.VisualBasic.Workspaces.dll - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.2\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.2\lib\net46\Microsoft.CodeAnalysis.Workspaces.dll - ..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.2\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll + ..\packages\Microsoft.CodeAnalysis.Workspaces.Common.2.8.2\lib\net46\Microsoft.CodeAnalysis.Workspaces.Desktop.dll - ..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll - ..\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll - ..\..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll + ..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll - ..\..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll + ..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll - ..\..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll + ..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll - ..\..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll + ..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll - ..\..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll + ..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll - ..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll - ..\..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll + ..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll - ..\..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll + ..\packages\System.Diagnostics.StackTrace.4.3.0\lib\net46\System.Diagnostics.StackTrace.dll - ..\..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll - ..\..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll - ..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll - ..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll + ..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll - ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - ..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll + ..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll - ..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll + ..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll - ..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll + ..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll @@ -129,16 +129,16 @@ - ..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll - ..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll + ..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll - ..\..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll + ..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll - ..\..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll + ..\packages\System.Xml.XPath.XDocument.4.3.0\lib\net46\System.Xml.XPath.XDocument.dll @@ -152,15 +152,15 @@ - - + + - + 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