Merge pull request AutomatedLab#234 from AutomatedLab/develop

Merging develop into master
raandree · Jan 20, 2018 · d7ff460 · d7ff460
2 parents 163fe17 + 9223879
commit d7ff460
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/Automated-Lab_icon128.png → Assets/Automated-Lab_icon128.png b/Automated-Lab_icon128.png → Assets/Automated-Lab_icon128.png
diff --git a/Automated-Lab_icon256.png → Assets/Automated-Lab_icon256.png b/Automated-Lab_icon256.png → Assets/Automated-Lab_icon256.png
diff --git a/Automated-Lab_icon512.png → Assets/Automated-Lab_icon512.png b/Automated-Lab_icon512.png → Assets/Automated-Lab_icon512.png
diff --git a/Automated-Lab_icon64.png → Assets/Automated-Lab_icon64.png b/Automated-Lab_icon64.png → Assets/Automated-Lab_icon64.png
diff --git a/AutomatedLab.sln b/AutomatedLab.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26730.16
+VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Installer", "Installer\Installer.wixproj", "{F9ED990E-1D1D-4F11-B1A7-6ACC8D3C40C2}"
 EndProject
@@ -151,10 +151,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		.gitmodules = .gitmodules
 		appveyor.yml = appveyor.yml
-		Automated-Lab_icon128.png = Automated-Lab_icon128.png
-		Automated-Lab_icon256.png = Automated-Lab_icon256.png
-		Automated-Lab_icon512.png = Automated-Lab_icon512.png
-		Automated-Lab_icon64.png = Automated-Lab_icon64.png
 		automatedlab.psdeploy.ps1 = automatedlab.psdeploy.ps1
 		Build.ps1 = Build.ps1
 		CHANGELOG.md = CHANGELOG.md
@@ -507,6 +503,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VMWare", "VMWare", "{9598B1
 		LabSources\SampleScripts\VMWare\VMWare Single Server.ps1 = LabSources\SampleScripts\VMWare\VMWare Single Server.ps1
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets", "Assets", "{17D0AC55-9455-4642-8344-495533568B68}"
+	ProjectSection(SolutionItems) = preProject
+		Assets\Automated-Lab_icon128.png = Assets\Automated-Lab_icon128.png
+		Assets\Automated-Lab_icon256.png = Assets\Automated-Lab_icon256.png
+		Assets\Automated-Lab_icon512.png = Assets\Automated-Lab_icon512.png
+		Assets\Automated-Lab_icon64.png = Assets\Automated-Lab_icon64.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
@@ -31,6 +31,7 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Resources\AutomatedLab.ico" />
     <Content Include="Resources\Banner.bmp" />
     <Content Include="Resources\Complete.ico" />
     <Content Include="Resources\Custom.ico" />