Merge branch 'master' of https://github.com/clemensv/azure-relay-bridge

Azure · Sep 21, 2022 · e225be2 · e225be2
2 parents 74423af + 852fb8f
commit e225be2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/azbridge-installer/installTransforms.xslt b/src/azbridge-installer/installTransforms.xslt
@@ -25,7 +25,7 @@
         <xsl:with-param name="fileid">SvcFileId</xsl:with-param>
       </xsl:apply-templates>
       <wix:ServiceInstall Id="InstallABS" Name="azbridgesvc" Description="Azure Relay Bridge Service" Start="demand" ErrorControl="normal" Type="ownProcess" Arguments="--svc" Vital="yes" Account="NT AUTHORITY\NETWORKSERVICE" />
-      <!--<wix:ServiceControl Id="ControllABS" Name="azbridgesvc" Start="install" Stop="both" Remove="uninstall" Wait="yes" />-->
+      <wix:ServiceControl Id="ControllABS" Name="azbridgesvc" Start="install" Stop="both" Remove="uninstall" Wait="yes" />
     </xsl:copy>
   </xsl:template>
 

diff --git a/src/azbridge/azbridge.csproj b/src/azbridge/azbridge.csproj
@@ -56,10 +56,10 @@
 		<Content Include="appsettings.json" CopyToPublishDirectory="False">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
-		<Content Include="azbridge_config.svc.yml" CopyToPublishDirectory="PreserveNewest" Condition="! $(RuntimeIdentifier.StartsWith('win'))">
+		<Content Include="azbridge_config.svc.yml" CopyToPublishDirectory="PreserveNewest">
 			<LinuxPath>/etc/azbridge/azbridge_config.svc.yml</LinuxPath>
 		</Content>
-		<Content Include="azbridge_config.machine.yml" CopyToPublishDirectory="PreserveNewest" Condition="! $(RuntimeIdentifier.StartsWith('win'))">
+		<Content Include="azbridge_config.machine.yml" CopyToPublishDirectory="PreserveNewest">
 			<LinuxPath>/etc/azbridge/azbridge_config.machine.yml</LinuxPath>
 		</Content>
 		<Content Include="azbridge.service" CopyToPublishDirectory="PreserveNewest" Condition="$(DefineConstants.Contains('_SYSTEMD'))">