1.0.2 - 2019/03/07

@2019.2
ErikMoczi · Mar 8, 2019 · 78e1c86 · 78e1c86
1 parent c19f75a
commit 78e1c86
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/package/CHANGELOG.md b/package/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Code Editor Package for Visual Studio Code
 
-## [1.0.1] - 2019-01-01
+## [1.0.2] - 2019-01-01
 
 ### This is the first release of *Unity Package vscode_editor*.
 

diff --git a/package/Editor/ProjectGeneration.cs b/package/Editor/ProjectGeneration.cs
@@ -153,8 +153,14 @@ enum ScriptingLanguage
 
         string[] m_ProjectSupportedExtensions = new string[0];
         public string ProjectDirectory { get; }
+
         readonly string m_ProjectName;
         readonly IAssemblyNameProvider m_AssemblyNameProvider;
+        const string k_ToolsVersion = "4.0";
+        const string k_ProductVersion = "10.0.20506";
+        const string k_BaseDirectory = ".";
+        const string k_TargetFrameworkVersion = "v4.7.1";
+        const string k_TargetLanguageVersion = "latest";
 
         public ProjectGeneration()
         {
@@ -536,35 +542,18 @@ public string SolutionFile()
             IEnumerable<ResponseFileData> responseFilesData
         )
         {
-            string targetFrameworkVersion;
-            string targetLanguageVersion;
-            var toolsVersion = "4.0";
-            var productVersion = "10.0.20506";
-            const string baseDirectory = ".";
-
-            if (island.compilerOptions.ApiCompatibilityLevel == ApiCompatibilityLevel.NET_4_6)
-            {
-                targetFrameworkVersion = "v4.7.1";
-                targetLanguageVersion = "latest";
-            }
-            else
-            {
-                targetFrameworkVersion = "v3.5";
-                targetLanguageVersion = "4";
-            }
-
             var arguments = new object[]
             {
-                toolsVersion, productVersion, ProjectGuid(island.outputPath),
+                k_ToolsVersion, k_ProductVersion, ProjectGuid(island.outputPath),
                 InternalEditorUtility.GetEngineAssemblyPath(),
                 InternalEditorUtility.GetEditorAssemblyPath(),
                 string.Join(";", new[] { "DEBUG", "TRACE" }.Concat(EditorUserBuildSettings.activeScriptCompilationDefines).Concat(island.defines).Concat(responseFilesData.SelectMany(x => x.Defines)).Distinct().ToArray()),
                 MSBuildNamespaceUri,
                 Utility.FileNameWithoutExtension(island.outputPath),
                 EditorSettings.projectGenerationRootNamespace,
-                targetFrameworkVersion,
-                targetLanguageVersion,
-                baseDirectory,
+                k_TargetFrameworkVersion,
+                k_TargetLanguageVersion,
+                k_BaseDirectory,
                 island.compilerOptions.AllowUnsafeCode | responseFilesData.Any(x => x.Unsafe)
             };
 

diff --git a/package/package.json b/package/package.json
@@ -2,16 +2,16 @@
   "name": "com.unity.ide.vscode",
   "displayName": "Visual Studio Code Editor",
   "description": "Code editor integration for supporting Visual Studio Code as code editor for unity. Adds support for generating csproj files for intellisense purposes, auto discovery of installations, etc.",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "unity": "2019.2",
   "unityRelease": "0a7",
   "dependencies": {},
   "relatedPackages": {
-    "com.unity.ide.vscode.tests": "1.0.1"
+    "com.unity.ide.vscode.tests": "1.0.2"
   },
   "repository": {
     "type": "git",
     "url": "git@github.cds.internal.unity3d.com:unity/com.unity.ide.vscode.git",
-    "revision": "2a826b3ad4386735e11a08fc5f904a98a21522a5"
+    "revision": "a05e102cc4e4f6ef2df1a0e726a843bf92f39d34"
   }
 }
diff --git a/versions.txt b/versions.txt
@@ -8,3 +8,4 @@
 0.1.0-preview.11
 1.0.0
 1.0.1
+1.0.2