Sync with latest C# release

Redirect default to v1.5.0
ngs-doo · Feb 18, 2019 · c84cf08 · c84cf08
1 parent 471750f
commit c84cf08
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/CommandLineClient/pom.xml b/CommandLineClient/pom.xml
@@ -62,7 +62,7 @@
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
-					<compilerArgument>-encoding UTF-8</compilerArgument>
+					<encoding>UTF-8</encoding>
 					<compilerArgument>-Xlint:all</compilerArgument>
 					<showWarnings>true</showWarnings>
 					<showDeprecation>true</showDeprecation>

diff --git a/...ient/src/main/java/com/dslplatform/compiler/client/parameters/build/CompileRevenjNet.java b/...ient/src/main/java/com/dslplatform/compiler/client/parameters/build/CompileRevenjNet.java
@@ -112,8 +112,8 @@ private static boolean downloadFromGithub(
 			conn.connect();
 			final String tag;
 			if (conn.getResponseCode() != 302) {
-				context.warning("Error downloading " + name + " from GitHub. Will continue with tag 1.4.2. Expecting redirect. Got: " + conn.getResponseCode());
-				tag = "1.4.2";
+				context.warning("Error downloading " + name + " from GitHub. Will continue with tag 1.5.0. Expecting redirect. Got: " + conn.getResponseCode());
+				tag = "1.5.0";
 			} else {
 				final String redirect = conn.getHeaderField("Location");
 				tag = redirect.substring(redirect.lastIndexOf('/') + 1);

diff --git a/VisualStudioPlugin/Gui/CompileTargets.cs b/VisualStudioPlugin/Gui/CompileTargets.cs
@@ -16,7 +16,7 @@ internal class CompileTargets
 		}
 		private static List<LibraryInfo.Nuget> RevenjStandard()
 		{
-			return new List<LibraryInfo.Nuget>(new[] { new LibraryInfo.Nuget { Project = "revenj", Version = "1.4.2" } });
+			return new List<LibraryInfo.Nuget>(new[] { new LibraryInfo.Nuget { Project = "revenj", Version = "1.5.0" } });
 		}
 
 		private static readonly string[] PocoDependencies = new[] {
@@ -77,7 +77,7 @@ public string CompilerPath
 		private static Version RevenjServerVersion(LibraryInfo library)
 		{
 			Version version;
-			var nuget = library.Nugets.Find(it => it.Project == "revenj");
+			var nuget = library.Nugets.Find(it => "revenj".Equals(it.Project, StringComparison.InvariantCultureIgnoreCase));
 			if (library.BuildType == BuildTypes.DotNetStandard && nuget != null && Version.TryParse(nuget.Version, out version))
 				return version;
 			if (!library.DependenciesExists) return null;

diff --git a/VisualStudioPlugin/Gui/ServerActions.cs b/VisualStudioPlugin/Gui/ServerActions.cs
@@ -61,7 +61,7 @@ private static Stream DownloadGithubRevenj(string zip)
 				latest.KeepAlive = false;
 				latest.AllowAutoRedirect = false;
 				var redirect = (HttpWebResponse)latest.GetResponse();
-				var tag = "1.4.2";
+				var tag = "1.5.0";
 				if (redirect.StatusCode == HttpStatusCode.Redirect)
 				{
 					var location = redirect.GetResponseHeader("Location");

diff --git a/VisualStudioPlugin/Properties/AssemblyInfo.cs b/VisualStudioPlugin/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("N.G.S.")]
 [assembly: AssemblyProduct("DDD for DSL Platform")]
-[assembly: AssemblyCopyright("Copyright © N.G.S. 2018")]
+[assembly: AssemblyCopyright("Copyright © N.G.S. 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
@@ -28,8 +28,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.8.1.*")]
-[assembly: AssemblyFileVersion("1.8.1.0")]
+[assembly: AssemblyVersion("1.8.2.*")]
+[assembly: AssemblyFileVersion("1.8.2.0")]
 
 
 
diff --git a/VisualStudioPlugin/source.extension.vsixmanifest.vs2010 b/VisualStudioPlugin/source.extension.vsixmanifest.vs2010
@@ -3,7 +3,7 @@
   <Identifier Id="DDDLanguage..0c2dba72-d915-4d37-9379-2100b92042de">
     <Name>DSL Platform</Name>
     <Author>N.G.S.</Author>
-    <Version>1.8.1</Version>
+    <Version>1.8.2</Version>
     <Description xml:space="preserve">Domain Specification Language by DSL Platform. Based on Domain-Driven Design</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>https://dsl-platform.com</MoreInfoUrl>