From e04af3c748dcb161abb4a883339e850a906490f3 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 10 Dec 2019 09:16:17 +0000 Subject: [PATCH] fear ..dll --- Makefile | 3 ++ src/GoogleCode/GoogleTranslate/project.json | 2 +- src/OAuth.AspNet.AuthServer/project.json | 4 +- src/OAuth.AspNet.Token/project.json | 4 +- src/Yavsc.Abstract/project.json | 2 +- src/Yavsc.Server/project.json | 4 +- src/Yavsc/Makefile | 4 +- src/Yavsc/Services/GoogleApis/Translate.cs | 60 --------------------- src/Yavsc/project.json | 3 +- src/cli/project.json | 2 +- src/sampleWebAsWebApiClient/project.json | 2 +- src/test/project.json | 2 +- 12 files changed, 16 insertions(+), 76 deletions(-) delete mode 100644 src/Yavsc/Services/GoogleApis/Translate.cs diff --git a/Makefile b/Makefile index 6c28ba52..b258c446 100644 --- a/Makefile +++ b/Makefile @@ -23,5 +23,8 @@ prepare_all_code: make -C src/Yavsc.Server prepare_code make -C src/Yavsc prepare_code +bundle: + mkbundle --deps $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/Microsoft.Dnx.Host.Mono.dll $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/Microsoft.Dnx.Loader.dll $(DNX_USER_HOME)/runtimes/dnx-mono.1.0.0-rc1-update2/bin/Microsoft.Dnx.Host.dll src/Yavsc/bin/Debug/dnx451/Yavsc.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Hosting/1.0.0-rc1-final/lib/dnx451/Microsoft.AspNet.Hosting.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Authorization/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Authorization.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.DependencyInjection.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.DependencyInjection.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.Logging.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Logging.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.OptionsModel/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.OptionsModel.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.Configuration.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Configuration.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.Primitives/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Primitives.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.Configuration.Binder/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Configuration.Binder.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Mvc.Core/6.0.0-rc1-final/lib/net451/Microsoft.AspNet.Mvc.Core.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Mvc.Abstractions/6.0.0-rc1-final/lib/net451/Microsoft.AspNet.Mvc.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Http.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Http.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Http.Features/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Http.Features.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.WebEncoders.Core/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.WebEncoders.Core.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Routing/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Routing.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Http.Extensions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Http.Extensions.dll src/Yavsc/bin/output/approot/packages/Microsoft.Net.Http.Headers/1.0.0-rc1-final/lib/net451/Microsoft.Net.Http.Headers.dll src/Yavsc/bin/output/approot/packages/Microsoft.Extensions.MemoryPool/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.MemoryPool.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.FileProviders.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.FileProviders.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Hosting.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Hosting.Abstractions.dll src/Yavsc/bin/output/approot/packages/System.Diagnostics.DiagnosticSource/4.0.0-beta-23516/lib/portable-net45+win8+wp8+wpa81/System.Diagnostics.DiagnosticSource.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Mvc.ViewFeatures/6.0.0-rc1-final/lib/net451/Microsoft.AspNet.Mvc.ViewFeatures.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Html.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Html.Abstractions.dll src/Yavsc/bin/output/approot/packages/Microsoft.AspNet.Mvc.Formatters.Json/6.0.0-rc1-final/lib/net451/Microsoft.AspNet.Mvc.Formatters.Json.dll packages/Newtonsoft.Json/6.0.1/lib/net45/Newtonsoft.Json.dll packages/Microsoft.AspNet.JsonPatch/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.JsonPatch.dll packages/Microsoft.AspNet.Diagnostics.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Diagnostics.Abstractions.dll packages/Microsoft.AspNet.Antiforgery/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Antiforgery.dll packages/Microsoft.AspNet.DataProtection/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.DataProtection.dll packages/Microsoft.AspNet.DataProtection.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.DataProtection.Abstractions.dll packages/Microsoft.AspNet.Cryptography.Internal/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.Cryptography.Internal.dll packages/Microsoft.Extensions.WebEncoders/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.WebEncoders.dll packages/Microsoft.AspNet.WebUtilities/1.0.0-rc1-final/lib/net451/Microsoft.AspNet.WebUtilities.dll packages/Microsoft.AspNet.Mvc.DataAnnotations/6.0.0-rc1-final/lib/net451/Microsoft.AspNet.Mvc.DataAnnotations.dll packages/Microsoft.Extensions.Localization.Abstractions/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Localization.Abstractions.dll packages/Microsoft.Extensions.Localization/1.0.0-rc1-final/lib/net451/Microsoft.Extensions.Localization.dll src/Yavsc.Server/bin/Debug/net451/Yavsc.Server.dll src/Yavsc.Abstract/bin/Debug/net451/Yavsc.Abstract.dll -o yavsc + .PHONY: packages diff --git a/src/GoogleCode/GoogleTranslate/project.json b/src/GoogleCode/GoogleTranslate/project.json index 3393ac44..1023c65f 100644 --- a/src/GoogleCode/GoogleTranslate/project.json +++ b/src/GoogleCode/GoogleTranslate/project.json @@ -25,7 +25,7 @@ "defaultNamespace": "Yavsc" }, "dependencies": { - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "Gapi.net45": "1.0.1", "RestSharp": "103.4.0" }, diff --git a/src/OAuth.AspNet.AuthServer/project.json b/src/OAuth.AspNet.AuthServer/project.json index db34ae69..4448d3bd 100644 --- a/src/OAuth.AspNet.AuthServer/project.json +++ b/src/OAuth.AspNet.AuthServer/project.json @@ -26,7 +26,7 @@ "defaultNamespace": "Yavsc" }, "dependencies": { - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-rc1-*", "OAuth.AspNet.Token": { "type": "build", @@ -38,4 +38,4 @@ "frameworkAssemblies": {} } } -} \ No newline at end of file +} diff --git a/src/OAuth.AspNet.Token/project.json b/src/OAuth.AspNet.Token/project.json index 155a91ed..a21cae11 100644 --- a/src/OAuth.AspNet.Token/project.json +++ b/src/OAuth.AspNet.Token/project.json @@ -26,7 +26,7 @@ "defaultNamespace": "Yavsc" }, "dependencies": { - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "Microsoft.AspNet.Authentication.JwtBearer": "1.0.0-rc1-final", "Microsoft.AspNet.DataProtection": "1.0.0-rc1-final" }, @@ -35,4 +35,4 @@ "frameworkAssemblies": {} } } -} \ No newline at end of file +} diff --git a/src/Yavsc.Abstract/project.json b/src/Yavsc.Abstract/project.json index 9cb6e108..de01cdbc 100644 --- a/src/Yavsc.Abstract/project.json +++ b/src/Yavsc.Abstract/project.json @@ -28,7 +28,7 @@ "defaultNamespace": "Yavsc" }, "dependencies": { - "Newtonsoft.Json": "9.0.1" + "Newtonsoft.Json": "6.0.0" }, "frameworks": { "dnx451": { diff --git a/src/Yavsc.Server/project.json b/src/Yavsc.Server/project.json index ea74df57..f70cb7cd 100644 --- a/src/Yavsc.Server/project.json +++ b/src/Yavsc.Server/project.json @@ -52,8 +52,6 @@ "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final", "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc1-final", - "Microsoft.Extensions.DependencyInjection": "1.0.0-rc1-final", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.Globalization.CultureInfoCache": "1.0.0-rc1-final", "Microsoft.Extensions.Localization.Abstractions": "1.0.0-rc1-final", "Microsoft.Extensions.Logging": "1.0.0-rc1-final", @@ -62,7 +60,7 @@ "Microsoft.Extensions.Logging.TraceSource": "1.0.0-rc1-final", "Microsoft.Extensions.Options": "0.0.1-alpha", "Microsoft.Extensions.Localization": "1.0.0-rc1-final", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "Gapi.net45": "1.0.1", "PayPalMerchant-net451": "2.7.109", "MailKit": "1.12.0", diff --git a/src/Yavsc/Makefile b/src/Yavsc/Makefile index ea0fb08c..cd331642 100644 --- a/src/Yavsc/Makefile +++ b/src/Yavsc/Makefile @@ -10,8 +10,8 @@ BASERESX= Resources/Yavsc.Models.IT.Fixing.Resources.resx \ Resources/Yavsc.ViewModels.EnrolerViewModel.resx \ Resources/Yavsc.YavscLocalisation.resx BASERESXGEN=$(BASERESX:.resx=.Designer.cs) -MCS_OPTIONS=--debug -MONO_OPTIONS=--debug +MCS_OPTIONS=-debug +MONO_OPTIONS="--debug" include $(MAKEFILE_DIR)/versioning.mk include $(MAKEFILE_DIR)/dnx.mk diff --git a/src/Yavsc/Services/GoogleApis/Translate.cs b/src/Yavsc/Services/GoogleApis/Translate.cs deleted file mode 100644 index c4b28098..00000000 --- a/src/Yavsc/Services/GoogleApis/Translate.cs +++ /dev/null @@ -1,60 +0,0 @@ -using Yavsc.Server; -using GoogleTranslateNET; -using System; -using Microsoft.Extensions.Logging; -using Microsoft.Extensions.OptionsModel; -using Microsoft.AspNet.Localization; -using System.Linq; - -namespace Yavsc.Services.GoogleApis -{ - public class Translator : ITranslator - { - GoogleTranslate _gg; - ILogger _logger; - - public Translator(ILoggerFactory loggerFactory, - IOptions rqLocOptions, - IOptions gSettings) - { - _gg = new GoogleTranslate(gSettings.Value.ApiKey); - _logger = loggerFactory.CreateLogger(); - } - - /// - /// - /// - /// - /// - static Language GetLanguageFromCountryCode(string lang) - { - switch (lang) { - case "fr": - case "fr-FR": - case "French": - return Language.French; - - case "en": - case "en-GB": - case "en-US": - case "English": - return Language.English; - - case "pt": - case "br": - return Language.Portuguese; - } - return Language.Automatic; - } - - public string[] Translate(string slang, string dlang, string[] text) - { - var destinationLanguage = GetLanguageFromCountryCode(dlang); - if (destinationLanguage == Language.Unknown) - throw new Exception ("destinationLanguage == Language.Unknown"); - var sourceLanguage = GetLanguageFromCountryCode(slang); - var gResult = _gg.Translate(sourceLanguage, destinationLanguage, text); - return gResult.Select(tr => tr.TranslatedText).ToArray(); - } - } -} \ No newline at end of file diff --git a/src/Yavsc/project.json b/src/Yavsc/project.json index c7920c91..c764957f 100644 --- a/src/Yavsc/project.json +++ b/src/Yavsc/project.json @@ -150,8 +150,7 @@ "Yavsc.Server": { "target": "project", "type": "build" - }, - "GoogleTranslate": "1.0.5" + } }, "commands": { "ef": "EntityFramework.Commands", diff --git a/src/cli/project.json b/src/cli/project.json index a022c9c5..36a134f3 100644 --- a/src/cli/project.json +++ b/src/cli/project.json @@ -45,7 +45,7 @@ "Microsoft.Extensions.WebEncoders.Core": "1.0.0-rc1-final", "Microsoft.Framework.Configuration.Json": "1.0.0-beta8", "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-beta4", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "NJsonSchema.CodeGeneration.CSharp": "10.0.27", "Yavsc": { "version": "1.0.6-rc05", diff --git a/src/sampleWebAsWebApiClient/project.json b/src/sampleWebAsWebApiClient/project.json index bef966d1..38cd375b 100755 --- a/src/sampleWebAsWebApiClient/project.json +++ b/src/sampleWebAsWebApiClient/project.json @@ -29,7 +29,7 @@ "Microsoft.Extensions.Logging": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-final", "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-final", - "Newtonsoft.Json": "9.0.1" + "Newtonsoft.Json": "6.0.0" }, "commands": { "web": "Microsoft.AspNet.Server.Kestrel --server.urls=http://*:5002" diff --git a/src/test/project.json b/src/test/project.json index 85177e8b..4703594a 100644 --- a/src/test/project.json +++ b/src/test/project.json @@ -39,7 +39,7 @@ "EntityFramework.Commands": "7.0.0-rc1-final", "EntityFramework7.Npgsql": "3.1.0-rc1-3", "EntityFramework7.Npgsql.Design": "3.1.0-rc1-5", - "Newtonsoft.Json": "9.0.1", + "Newtonsoft.Json": "6.0.0", "xunit": "2.1.0", "xunit.analyzers": "0.9.0", "xunit.assert": "2.1.0",