Skip to content

Commit

Permalink
SccmTools.1.0.18110.10
Browse files Browse the repository at this point in the history
trondr committed Apr 20, 2018
1 parent 1136d57 commit 6d44640
Showing 12 changed files with 211 additions and 245 deletions.
6 changes: 3 additions & 3 deletions src/SccmTools.Gui/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
[assembly: AssemblyProduct("SccmTools.Gui")]
[assembly: AssemblyCopyright("Copyright © github.com.trondr 2018")]
[assembly: CLSCompliant(false)]
[assembly: AssemblyInformationalVersion("1.0.17086.6.3da91ef")]
[assembly: AssemblyVersion("1.0.17086.6")]
[assembly: AssemblyFileVersion("1.0.17086.6")]
[assembly: AssemblyInformationalVersion("1.0.18110.10.1136d57")]
[assembly: AssemblyVersion("1.0.18110.10")]
[assembly: AssemblyFileVersion("1.0.18110.10")]


6 changes: 3 additions & 3 deletions src/SccmTools.Library/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
[assembly: AssemblyProduct("SccmTools.Library")]
[assembly: AssemblyCopyright("Copyright © github.com.trondr 2018")]
[assembly: CLSCompliant(false)]
[assembly: AssemblyInformationalVersion("1.0.17086.6.3da91ef")]
[assembly: AssemblyVersion("1.0.17086.6")]
[assembly: AssemblyFileVersion("1.0.17086.6")]
[assembly: AssemblyInformationalVersion("1.0.18110.10.1136d57")]
[assembly: AssemblyVersion("1.0.18110.10")]
[assembly: AssemblyFileVersion("1.0.18110.10")]


5 changes: 5 additions & 0 deletions src/SccmTools.Library/SccmTools.Library.csproj
Original file line number Diff line number Diff line change
@@ -225,6 +225,11 @@
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>del "$(OutDir)AdminUI*.dll"
del "$(OutDir)DcmObjectModel.dll"
del "$(OutDir)Microsoft.ConfigurationManagement.*.dll"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
411 changes: 181 additions & 230 deletions src/SccmTools.Setup/Components.wxs

Large diffs are not rendered by default.

Binary file modified src/SccmTools.Setup/License.rtf
Binary file not shown.
1 change: 1 addition & 0 deletions src/SccmTools.Setup/Product-en-us.wxl
Original file line number Diff line number Diff line change
@@ -3,4 +3,5 @@
<String Id="LanguageCode">1033</String>
<String Id="NewerVersionIsInstalled">A newer version of [ProductName] is already installed.</String>
<String Id="DotNetFrameWorkConditionMessage">[ProductName] depends on minumum .NET Framework 4.5.2 which can be dowloaded from http://www.microsoft.com/en-gb/download/details.aspx?id=42642 </String>
<String Id="MicrosoftConfigurationManagerConsoleMustBeInstalled">Microsoft Configuration Manager Console must be installed.</String>
</WixLocalization>
2 changes: 2 additions & 0 deletions src/SccmTools.Setup/Product.wxs
Original file line number Diff line number Diff line change
@@ -47,6 +47,8 @@
<PropertyRef Id ="NETFRAMEWORK45"/>

<Condition Message="!(loc.DotNetFrameWorkConditionMessage)">Installed OR NETFRAMEWORK45</Condition>

<Condition Message="!(loc.MicrosoftConfigurationManagerConsoleMustBeInstalled)">%SMS_ADMIN_UI_PATH</Condition>

<Upgrade Id="$(var.ProductUpgradeCode)">
<UpgradeVersion Property="SELFFOUND" OnlyDetect="yes" Minimum="!(bind.FileVersion.ProductDll)" IncludeMinimum='yes' Maximum="!(bind.FileVersion.ProductDll)" IncludeMaximum='yes' />
6 changes: 3 additions & 3 deletions src/SccmTools.Tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
[assembly: AssemblyProduct("SccmTools.Tests")]
[assembly: AssemblyCopyright("Copyright © github.com.trondr 2018")]
[assembly: CLSCompliant(false)]
[assembly: AssemblyInformationalVersion("1.0.17086.6.3da91ef")]
[assembly: AssemblyVersion("1.0.17086.6")]
[assembly: AssemblyFileVersion("1.0.17086.6")]
[assembly: AssemblyInformationalVersion("1.0.18110.10.1136d57")]
[assembly: AssemblyVersion("1.0.18110.10")]
[assembly: AssemblyFileVersion("1.0.18110.10")]


4 changes: 3 additions & 1 deletion src/SccmTools/Module/CustomInstaller.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections;
using System;
using System.Collections;
using System.ComponentModel;
using System.Reflection;
using SccmTools.Library.Module.Common.Install;
@@ -10,6 +11,7 @@ public partial class CustomInstaller : System.Configuration.Install.Installer
{
public CustomInstaller()
{
AppDomain.CurrentDomain.AssemblyResolve += AssemblyResolver.ResolveHandler;
InitializeComponent();
}

6 changes: 3 additions & 3 deletions src/SccmTools/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
[assembly: AssemblyProduct("SccmTools")]
[assembly: AssemblyCopyright("Copyright © github.com.trondr 2018")]
[assembly: CLSCompliant(false)]
[assembly: AssemblyInformationalVersion("1.0.17086.6.3da91ef")]
[assembly: AssemblyVersion("1.0.17086.6")]
[assembly: AssemblyFileVersion("1.0.17086.6")]
[assembly: AssemblyInformationalVersion("1.0.18110.10.1136d57")]
[assembly: AssemblyVersion("1.0.18110.10")]
[assembly: AssemblyFileVersion("1.0.18110.10")]


5 changes: 5 additions & 0 deletions src/SccmTools/SccmTools.csproj
Original file line number Diff line number Diff line change
@@ -196,6 +196,11 @@
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<PropertyGroup>
<PostBuildEvent>del "$(OutDir)AdminUI*.dll"
del "$(OutDir)DcmObjectModel.dll"
del "$(OutDir)Microsoft.ConfigurationManagement.*.dll"</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
4 changes: 2 additions & 2 deletions version.xml
Original file line number Diff line number Diff line change
@@ -2,6 +2,6 @@
<version>
<property name="major" value="1" />
<property name="minor" value="0" />
<property name="build" value="18108" />
<property name="revision" value="7" />
<property name="build" value="18110" />
<property name="revision" value="10" />
</version>

0 comments on commit 6d44640

Please sign in to comment.