pubcache path fix, closes issue #51

hey24sheep · Aug 12, 2022 · 7f59843 · 7f59843
1 parent d748ae9
commit 7f59843
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,4 +81,6 @@ typings/
 
 temp
 
+mintty.exe.stackdump
+
 *.vsix
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.3.8] - 12 August 2022
+- Extension version update to 0.3.8
+- *Env Task* version update to "0.3.1"
+- *Env Task* fixes pub cache path and debug output
+
 ## [0.3.7] - 9 July 2022
 - Extension version update to 0.3.7
 - *Build Task* version update to "0.3.3"

diff --git a/tasks/env/index.js b/tasks/env/index.js
@@ -14,7 +14,7 @@ const path = require("path");
 // paths
 const FLUTTER_EXE_RELATIVEPATH = 'bin';
 const DART_EXE_RELATIVEPATH = 'cache/dart-sdk/bin';
-const FLUTTER_PUB_CACHE_RELATIVEPATH = '.pub-cache/bin';
+const FLUTTER_PUB_CACHE_RELATIVEPATH = '.pub-cache';
 // env variables used as $('<env_var_name>') like $(FlutterToolPath)/flutter
 const FLUTTER_TOOL_PATH_ENV_VAR = 'FlutterToolPath';
 const FLUTTER_PUBCACHE_PATH_ENV_VAR = 'FlutterPubCachePath';
@@ -37,7 +37,7 @@ function main() {
         task.setVariable(FLUTTER_TOOL_PATH_ENV_VAR, fullFlutterPath);
         // 2.1 Create flutter pub-cache environment variable
         let fullPubCachePath = path.join(flutterDir, FLUTTER_PUB_CACHE_RELATIVEPATH);
-        task.debug(`Set ${DART_TOOL_PATH_ENV_VAR} with '${fullPubCachePath}'`);
+        task.debug(`Set ${FLUTTER_PUBCACHE_PATH_ENV_VAR} with '${fullPubCachePath}'`);
         task.setVariable(FLUTTER_PUBCACHE_PATH_ENV_VAR, fullPubCachePath);
         // 2.2 Create dart environment variable
         let fullDartPath = path.join(fullFlutterPath, DART_EXE_RELATIVEPATH);

diff --git a/tasks/env/index.ts b/tasks/env/index.ts
@@ -4,7 +4,7 @@ import * as path from 'path';
 // paths
 const FLUTTER_EXE_RELATIVEPATH = 'bin';
 const DART_EXE_RELATIVEPATH = 'cache/dart-sdk/bin';
-const FLUTTER_PUB_CACHE_RELATIVEPATH = '.pub-cache/bin';
+const FLUTTER_PUB_CACHE_RELATIVEPATH = '.pub-cache';
 
 // env variables used as $('<env_var_name>') like $(FlutterToolPath)/flutter
 const FLUTTER_TOOL_PATH_ENV_VAR: string = 'FlutterToolPath';
@@ -30,7 +30,7 @@ async function main(): Promise<void> {
 
 	// 2.1 Create flutter pub-cache environment variable
 	let fullPubCachePath: string = path.join(flutterDir, FLUTTER_PUB_CACHE_RELATIVEPATH);
-	task.debug(`Set ${DART_TOOL_PATH_ENV_VAR} with '${fullPubCachePath}'`);
+	task.debug(`Set ${FLUTTER_PUBCACHE_PATH_ENV_VAR} with '${fullPubCachePath}'`);
 	task.setVariable(FLUTTER_PUBCACHE_PATH_ENV_VAR, fullPubCachePath);
 
 	// 2.2 Create dart environment variable

diff --git a/tasks/env/task.json b/tasks/env/task.json
@@ -9,7 +9,7 @@
     "version": {
         "Major": 0,
         "Minor": 3,
-        "Patch": 0
+        "Patch": 1
     },
     "instanceNameFormat": "Flutter Env",
     "inputs": [

diff --git a/vss-extension.json b/vss-extension.json
@@ -1,7 +1,7 @@
 {
     "manifestVersion": 1,
     "id": "flutter",
-    "version": "0.3.7",
+    "version": "0.3.8",
     "name": "Flutter Tasks",
     "description": "Flutter extension for Azure DevOps. Install, build, analyze, command and env tasks for easier Flutter DevOps.",
     "publisher": "hey24sheep",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,4 +81,6 @@ typings/

		temp

		mintty.exe.stackdump

		*.vsix