From 77034460bbb4543bf32cc2af717f85aaaf8d9bf2 Mon Sep 17 00:00:00 2001
From: Mikael Karlsson <43226266+Micke-K@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:04:56 +1000
Subject: [PATCH] 3.1.4

Fixed Admin Templates import
---
 Extensions/EndpointManager.psm1 | 19 ++++---------------
 ReleaseNotes.md                 |  8 ++++++++
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Extensions/EndpointManager.psm1 b/Extensions/EndpointManager.psm1
index 1ef27eb..d39cddf 100644
--- a/Extensions/EndpointManager.psm1
+++ b/Extensions/EndpointManager.psm1
@@ -10,7 +10,7 @@ This module is for the Endpoint Manager/Intune View. It manages Export/Import/Co
 #>
 function Get-ModuleVersion
 {
-    '3.1.3'
+    '3.1.4'
 }
 
 function Invoke-InitializeModule
@@ -1436,22 +1436,11 @@ function Start-LoadAdministrativeTemplate
     if(-not $fileName) { return $null }
 
     $fi = [IO.FileInfo]$fileName
-    $obj = Get-Content $global:txtCompareFile.Text | ConvertFrom-Json 
+    if($fi.Exists -eq $false) { return }
 
-    if($obj.definitionValues)
-    {
-        return $obj
-    }
+    $obj = Get-Content $fi.FullName | ConvertFrom-Json 
 
-    $settingsFile = $fi.DirectoryName + "\" + $fi.BaseName + "_Settings.json"
-
-    if([IO.File]::Exists($settingsFile))
-    {
-        $definitionValues = Get-Content $settingsFile | ConvertFrom-Json
-
-        $obj | Add-Member Noteproperty -Name "definitionValues" -Value $definitionValues -Force  
-    }
-    $obj
+    return $obj    
 }
 
 #endregion
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index c2bb6a1..5dadc49 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,13 @@
 # Release Notes
 
+## 3.1.3 - 2021-07-06
+
+**Fixes**
+
+* Fixed issue importing Administrative Templates
+
+  See [Issue 18](https://github.com/Micke-K/IntuneManagement/issues/18) for more info
+
 ## 3.1.3 - 2021-07-05
 
 **New features**