Merge pull request #496 from Accenture/develop

4.1.3

.github/ISSUE_TEMPLATE/bug.yml

@@ -39,6 +39,7 @@ body:
  label: Version
  description: What version of our software are you running? (mcdev --version)
  options:
+ - 4.1.3
  - 4.1.2
  - 4.1.1
  - 4.1.0

README.md

@@ -123,7 +123,7 @@ If you experience issues installing Accenture SFMC DevTools, please check out th
 1. Install Accenture SFMC DevTools by running `npm install -g mcdev` (prefix with `sudo` on MacOS)
  - If you get an error, please see the below troubleshooting section.
 
-When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.2`).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.3`).
 
 > **_Side note for proud nerds_:**
 >
@@ -277,10 +277,10 @@ _Note: Regardless of which tag or branch you install_
 **Install specific version (using a version tag on npm):**
 
 ```bash
-npm install -g mcdev@4.1.2
+npm install -g mcdev@4.1.3
 ```
 
-**Warning**: When you used the above method to install Accenture SFMC DevTools for a specific version or tag, trying to [update Accenture SFMC DevTools](#updating-mcdev) might not download the most recently published official version but instead stay on the version or branch you previously selected (in the above examples: develop, 4.1.2)!
+**Warning**: When you used the above method to install Accenture SFMC DevTools for a specific version or tag, trying to [update Accenture SFMC DevTools](#updating-mcdev) might not download the most recently published official version but instead stay on the version or branch you previously selected (in the above examples: develop, 4.1.3)!
 
 > **Note**: The version is currently _not_ updated on the developer branch until a new release is published. Hence, you will not see a change if you run `mcdev --version`.
 
@@ -1493,7 +1493,7 @@ Assuming you cloned Accenture SFMC DevTools into `C:\repos\sfmc-devtools\` (or `
 
 This should tell npm to create a symlink to your cloned local directoty, allowing you to see updates you make in your mcdev repo instantly.
 
-To test your new **global** developer setup, run `mcdev --version` in CLI which should return the current version (e.g. `4.1.2`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `4.1.2-dev` and then run `mcdev --version` again to verify that your change propagates instantly.
+To test your new **global** developer setup, run `mcdev --version` in CLI which should return the current version (e.g. `4.1.3`). Then, go into your mcdev repo and update the version with the suffix `-dev`, e.g. to `4.1.3-dev` and then run `mcdev --version` again to verify that your change propagates instantly.
 
 > **Not recommended:** Alternatively, you can install it locally only by opening a terminal in your project directory and executing `npm install --save-dev "C:\repos\sfmc-devtools"`
 > To run the local version you need to prepend "npx" before your commands, e.g. `npx mcdev --version`
@@ -1531,7 +1531,7 @@ The following explains how you _could_ install it locally for certain edge cases
 4. Afterwards, install Accenture SFMC DevTools by running `npm install --save-dev mcdev`
  - If you get an error, please see the below troubleshooting section.
 
-When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.2`).
+When completed run `mcdev --version` and it will show you which version you installed (e.g. `4.1.3`).
 
 ### 9.3. NPM Scripts
 

lib/metadataTypes/Asset.js

@@ -723,13 +723,18 @@ class Asset extends MetadataType {
 
  const filecontent = await File.readFilteredFilename(
  [templateDir, this.definition.type, subType],
- metadata.customerKey,
+ templateName,
  fileExt,
  'base64'
  );
+
+ // keep old name if creating templates, otherwise use new name
+ const fileName =
+ mode === 'definition' ? metadata[this.definition.keyField] : templateName;
+
  fileList.push({
  subFolder: [this.definition.type, subType],
- fileName: templateName,
+ fileName: fileName,
  fileExt: fileExt,
  content: filecontent,
  encoding: 'base64',

package.json

@@ -1,6 +1,6 @@
 {
  "name": "mcdev",
- "version": "4.1.2",
+ "version": "4.1.3",
  "description": "Accenture Salesforce Marketing Cloud DevTools",
  "author": "joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
  "license": "MIT",

test/mockRoot/.mcdevrc.json

@@ -63,5 +63,5 @@
  "triggeredSendDefinition"
  ]
  },
- "version": "4.1.2"
+ "version": "4.1.3"
 }