Skip to content

Commit

Permalink
3.1.4
Browse files Browse the repository at this point in the history
Fixed Admin Templates import
  • Loading branch information
Micke-K committed Jul 5, 2021
1 parent e668140 commit 7703446
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 15 deletions.
19 changes: 4 additions & 15 deletions Extensions/EndpointManager.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}

$settingsFile = $fi.DirectoryName + "\" + $fi.BaseName + "_Settings.json"
$obj = Get-Content $fi.FullName | ConvertFrom-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
Expand Down
8 changes: 8 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -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**
Expand Down

0 comments on commit 7703446

Please sign in to comment.