Final rebranding

epmjunkie · Jan 10, 2016 · 8138cec · 8138cec
1 parent 428d040
commit 8138cec
Show file tree

Hide file tree

Showing 20 changed files with 174 additions and 342 deletions.
diff --git a/ServiceControl.BusinessObjects/ServiceControl.BusinessObjects.csproj b/ServiceControl.BusinessObjects/ServiceControl.BusinessObjects.csproj
@@ -57,7 +57,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EPMI.Core\EPMJunkie.Core.csproj">
+    <ProjectReference Include="..\EPMJunkie.Core\EPMJunkie.Core.csproj">
       <Project>{0D81E327-ACCD-4A65-955D-3D6A8B5E25D0}</Project>
       <Name>EPMJunkie.Core</Name>
     </ProjectReference>

diff --git a/ServiceControl.Service/Constants.cs b/ServiceControl.Service/Constants.cs
@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Text;
 
-namespace EPMI.ServiceControl.Service
+namespace ServiceControl.Service
 {
     internal class Constants
     {

diff --git a/ServiceControl.Service/Program.cs b/ServiceControl.Service/Program.cs
@@ -3,9 +3,9 @@
 using System.Linq;
 using System.ServiceProcess;
 using System.Text;
-using EPMI.Core;
+using EPMJunkie.Core;
 
-namespace EPMI.ServiceControl.Service
+namespace ServiceControl.Service
 {
     static class Program
     {

diff --git a/ServiceControl.Service/ProjectInstaller.Designer.cs b/ServiceControl.Service/ProjectInstaller.Designer.cs
diff --git a/ServiceControl.Service/ProjectInstaller.cs b/ServiceControl.Service/ProjectInstaller.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 
 
-namespace EPMI.ServiceControl.Service
+namespace ServiceControl.Service
 {
     [RunInstaller(true)]
     public partial class ProjectInstaller : System.Configuration.Install.Installer

diff --git a/ServiceControl.Service/Properties/AssemblyInfo.cs b/ServiceControl.Service/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("EPMI.ServiceControl.Service")]
+[assembly: AssemblyTitle("ServiceControl.Service")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("EPMI.ServiceControl.Service")]
+[assembly: AssemblyProduct("ServiceControl.Service")]
 [assembly: AssemblyCopyright("Copyright ©  2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

diff --git a/...ervice/EPMI.ServiceControl.Service.csproj → ...rol.Service/ServiceControl.Service.csproj b/...ervice/EPMI.ServiceControl.Service.csproj → ...rol.Service/ServiceControl.Service.csproj
@@ -8,12 +8,27 @@
     <ProjectGuid>{96A22F1B-0F69-4768-A28E-A7435116E228}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EPMI.ServiceControl.Service</RootNamespace>
-    <AssemblyName>EPMI.ServiceControl.Service</AssemblyName>
+    <RootNamespace>ServiceControl.Service</RootNamespace>
+    <AssemblyName>ServiceControl.Service</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -77,20 +92,6 @@
       <DependentUpon>ProjectInstaller.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EPMI.Core\EPMI.Core.csproj">
-      <Project>{0D81E327-ACCD-4A65-955D-3D6A8B5E25D0}</Project>
-      <Name>EPMI.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\EPMI.ServiceControl.BusinessObjects\EPMI.ServiceControl.BusinessObjects.csproj">
-      <Project>{C4376D56-33E0-411A-A4A9-DB8CD5788DB7}</Project>
-      <Name>EPMI.ServiceControl.BusinessObjects</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\EPMI.ServiceControl.Utility\EPMI.ServiceControl.Utility.csproj">
-      <Project>{69CACD7F-D599-4954-906E-ECC5AFE2E8D1}</Project>
-      <Name>EPMI.ServiceControl.Utility</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Profiles\Hosts.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -105,6 +106,37 @@
     </None>
     <None Include="log4net.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\EPMJunkie.Core\EPMJunkie.Core.csproj">
+      <Project>{0d81e327-accd-4a65-955d-3d6a8b5e25d0}</Project>
+      <Name>EPMJunkie.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ServiceControl.BusinessObjects\ServiceControl.BusinessObjects.csproj">
+      <Project>{c4376d56-33e0-411a-a4a9-db8cd5788db7}</Project>
+      <Name>ServiceControl.BusinessObjects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ServiceControl.Utility\ServiceControl.Utility.csproj">
+      <Project>{69cacd7f-d599-4954-906e-ecc5afe2e8d1}</Project>
+      <Name>ServiceControl.Utility</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.

diff --git a/ServiceControl.Service/ServiceControlService.Designer.cs b/ServiceControl.Service/ServiceControlService.Designer.cs
diff --git a/ServiceControl.Service/ServiceControlService.cs b/ServiceControl.Service/ServiceControlService.cs
@@ -10,7 +10,7 @@
 using System.Text;
 #endregion
 
-namespace EPMI.ServiceControl.Service
+namespace ServiceControl.Service
 {
     public partial class ServiceControlService : ServiceBase
     {
@@ -40,7 +40,7 @@ public void StartUp()
         {
             if (WcfServiceHost != null)
                 WcfServiceHost.Close();
-            WcfServiceHost = new ServiceHost(typeof(EPMI.ServiceControl.WCF.Listener));
+            WcfServiceHost = new ServiceHost(typeof(ServiceControl.WCF.Listener));
             WcfServiceHost.Open();
         }
         public void ShutDown()

diff --git a/ServiceControl.Service/ServicesHandler.cs b/ServiceControl.Service/ServicesHandler.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using BO = EPMI.ServiceControl.BusinessObjects;
-using EPMI.ServiceControl.Utility;
+using BO = ServiceControl.BusinessObjects;
+using ServiceControl.Utility;
 
-namespace EPMI.ServiceControl.Service
+namespace ServiceControl.Service
 {
     internal class ServicesHandler
     {

diff --git a/ServiceControl.Service/app.config b/ServiceControl.Service/app.config
@@ -7,9 +7,9 @@
   app.config file. System.Configuration does not support config files for libraries. -->
   <system.serviceModel>
     <services>
-      <service name="EPMI.ServiceControl.WCF.Listener">
+      <service name="ServiceControl.WCF.Listener">
         <endpoint address="" binding="netTcpBinding" bindingConfiguration=""
-          contract="EPMI.ServiceControl.WCF.IListener">
+          contract="ServiceControl.WCF.IListener">
           <identity>
             <dns value="localhost" />
           </identity>

diff --git a/ServiceControl.Utility/ServiceControl.Utility.csproj b/ServiceControl.Utility/ServiceControl.Utility.csproj
@@ -52,11 +52,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EPMI.Core\EPMJunkie.Core.csproj">
+    <ProjectReference Include="..\EPMJunkie.Core\EPMJunkie.Core.csproj">
       <Project>{0D81E327-ACCD-4A65-955D-3D6A8B5E25D0}</Project>
       <Name>EPMJunkie.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\EPMI.ServiceControl.BusinessObjects\ServiceControl.BusinessObjects.csproj">
+    <ProjectReference Include="..\ServiceControl.BusinessObjects\ServiceControl.BusinessObjects.csproj">
       <Project>{C4376D56-33E0-411A-A4A9-DB8CD5788DB7}</Project>
       <Name>ServiceControl.BusinessObjects</Name>
     </ProjectReference>