Skip to content

Commit 609e434

Browse files
janstaelensskylinejanstaelensskyline
committed
Updated indentation
1 parent b8c9189 commit 609e434

File tree

2 files changed

+86
-88
lines changed

2 files changed

+86
-88
lines changed

‎working/templates/dxmsolution/InstallerProject/InstallerProject.wixproj

+72-72
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,75 @@
11
<Project Sdk="WixToolset.Sdk/4.0.5">
2-
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.5" />
3-
<PropertyGroup>
4-
<ProductVersion>1.0.0.0</ProductVersion>
5-
<Name>$InstallerName$</Name>
6-
</PropertyGroup>
7-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
8-
<DefineConstants>Debug;ProductVersion=$(ProductVersion)</DefineConstants>
9-
<WixVariables>ProductVersion=$(ProductVersion)</WixVariables>
10-
<OutputName>$FullDxmName$ $(ProductVersion) ($(Configuration))</OutputName>
11-
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
13-
<DefineConstants>ProductVersion=$(ProductVersion)</DefineConstants>
14-
<WixVariables>ProductVersion=$(ProductVersion)</WixVariables>
15-
<OutputName>$FullDxmName$ $(ProductVersion)</OutputName>
16-
<SuppressPdbOutput>true</SuppressPdbOutput>
17-
</PropertyGroup>
18-
<ItemGroup>
19-
<Content Include="icon.ico" />
20-
<Content Include="$DxmModuleName$.wxi" />
21-
</ItemGroup>
22-
<ItemGroup>
23-
<None Include="$DxmModuleName$.xslt" />
24-
</ItemGroup>
25-
<ItemGroup>
26-
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.5" />
27-
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.5" />
28-
<PackageReference Include="WixToolset.Heat" Version="4.0.5" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<ProjectReference Include="..\$ServiceName$\$ServiceName$.csproj">
32-
<Name>$ServiceName$</Name>
33-
<Project>{43695e16-1dc5-4a55-a915-04e1f7f8dab6}</Project>
34-
<Private>True</Private>
35-
<DoNotHarvest>True</DoNotHarvest>
36-
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
37-
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
38-
</ProjectReference>
39-
</ItemGroup>
40-
<!-- Make use of harvesting. For more info, refer to: https://wixtoolset.org/docs/tools/heat/ -->
41-
<Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.5" />
42-
<Target Name="BeforeBuild">
43-
<!-- Optional publishing of webApp you actually want to install.-->
44-
<!--<Exec Command="dotnet publish $(SolutionDir)Path\To\My\app.csproj -c $(Configuration) -p:PublishProfile=$(Configuration)" />-->
45-
<PropertyGroup>
46-
<HarvestDirectoryAutogenerateGuids>true</HarvestDirectoryAutogenerateGuids>
47-
<HarvestDirectorySuppressFragments>true</HarvestDirectorySuppressFragments>
48-
<!-- HarvestDirectorySuppressUniqueIds: Makes it more readable, set to false if you have problems -->
49-
<HarvestDirectorySuppressUniqueIds>false</HarvestDirectorySuppressUniqueIds>
50-
</PropertyGroup>
51-
<ItemGroup>
52-
<HarvestDirectory Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0">
53-
<!--<PreprocessorVariable>var.publishDir</PreprocessorVariable>-->
54-
<Transforms>$(ProjectDir)$DxmModuleName$.xslt</Transforms>
55-
<SuppressRegistry>true</SuppressRegistry>
56-
<SuppressRootDirectory>true</SuppressRootDirectory>
57-
<SuppressCom>true</SuppressCom>
58-
<KeepEmptyDirectories>false</KeepEmptyDirectories>
59-
<ComponentGroupName>$DxmModuleName$DotNetComponents</ComponentGroupName>
60-
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
61-
</HarvestDirectory>
62-
</ItemGroup>
2+
<Import Project="Sdk.props" Sdk="WixToolset.Sdk" Version="4.0.5"/>
3+
<PropertyGroup>
4+
<ProductVersion>1.0.0.0</ProductVersion>
5+
<Name>$InstallerName$</Name>
6+
</PropertyGroup>
7+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
8+
<DefineConstants>Debug;ProductVersion=$(ProductVersion)</DefineConstants>
9+
<WixVariables>ProductVersion=$(ProductVersion)</WixVariables>
10+
<OutputName>$FullDxmName$ $(ProductVersion) ($(Configuration))</OutputName>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
13+
<DefineConstants>ProductVersion=$(ProductVersion)</DefineConstants>
14+
<WixVariables>ProductVersion=$(ProductVersion)</WixVariables>
15+
<OutputName>$FullDxmName$ $(ProductVersion)</OutputName>
16+
<SuppressPdbOutput>true</SuppressPdbOutput>
17+
</PropertyGroup>
6318
<ItemGroup>
64-
<HarvestDirectory Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0/runtimes/win">
65-
<SuppressRegistry>true</SuppressRegistry>
66-
<SuppressRootDirectory>true</SuppressRootDirectory>
67-
<SuppressCom>true</SuppressCom>
68-
<KeepEmptyDirectories>false</KeepEmptyDirectories>
69-
<ComponentGroupName>$DxmModuleName$DotNetWinRuntimeComponents</ComponentGroupName>
70-
<DirectoryRefId>INSTALLFOLDERRUNTIMESWIN</DirectoryRefId>
71-
</HarvestDirectory>
72-
<BindPath Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0/runtimes/win" />
73-
</ItemGroup>
74-
</Target>
19+
<Content Include="icon.ico"/>
20+
<Content Include="$DxmModuleName$.wxi"/>
21+
</ItemGroup>
22+
<ItemGroup>
23+
<None Include="$DxmModuleName$.xslt"/>
24+
</ItemGroup>
25+
<ItemGroup>
26+
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.5"/>
27+
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.5"/>
28+
<PackageReference Include="WixToolset.Heat" Version="4.0.5"/>
29+
</ItemGroup>
30+
<ItemGroup>
31+
<ProjectReference Include="..\$ServiceName$\$ServiceName$.csproj">
32+
<Name>$ServiceName$</Name>
33+
<Project>{43695e16-1dc5-4a55-a915-04e1f7f8dab6}</Project>
34+
<Private>True</Private>
35+
<DoNotHarvest>True</DoNotHarvest>
36+
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
37+
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
38+
</ProjectReference>
39+
</ItemGroup>
40+
<!-- Make use of harvesting. For more info, refer to: https://wixtoolset.org/docs/tools/heat/ -->
41+
<Import Project="Sdk.targets" Sdk="WixToolset.Sdk" Version="4.0.5"/>
42+
<Target Name="BeforeBuild">
43+
<!-- Optional publishing of webApp you actually want to install.-->
44+
<!--<Exec Command="dotnet publish $(SolutionDir)Path\To\My\app.csproj -c $(Configuration) -p:PublishProfile=$(Configuration)" />-->
45+
<PropertyGroup>
46+
<HarvestDirectoryAutogenerateGuids>true</HarvestDirectoryAutogenerateGuids>
47+
<HarvestDirectorySuppressFragments>true</HarvestDirectorySuppressFragments>
48+
<!-- HarvestDirectorySuppressUniqueIds: Makes it more readable, set to false if you have problems -->
49+
<HarvestDirectorySuppressUniqueIds>false</HarvestDirectorySuppressUniqueIds>
50+
</PropertyGroup>
51+
<ItemGroup>
52+
<HarvestDirectory Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0">
53+
<!--<PreprocessorVariable>var.publishDir</PreprocessorVariable>-->
54+
<Transforms>$(ProjectDir)$DxmModuleName$.xslt</Transforms>
55+
<SuppressRegistry>true</SuppressRegistry>
56+
<SuppressRootDirectory>true</SuppressRootDirectory>
57+
<SuppressCom>true</SuppressCom>
58+
<KeepEmptyDirectories>false</KeepEmptyDirectories>
59+
<ComponentGroupName>$DxmModuleName$DotNetComponents</ComponentGroupName>
60+
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
61+
</HarvestDirectory>
62+
</ItemGroup>
63+
<ItemGroup>
64+
<HarvestDirectory Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0/runtimes/win">
65+
<SuppressRegistry>true</SuppressRegistry>
66+
<SuppressRootDirectory>true</SuppressRootDirectory>
67+
<SuppressCom>true</SuppressCom>
68+
<KeepEmptyDirectories>false</KeepEmptyDirectories>
69+
<ComponentGroupName>$DxmModuleName$DotNetWinRuntimeComponents</ComponentGroupName>
70+
<DirectoryRefId>INSTALLFOLDERRUNTIMESWIN</DirectoryRefId>
71+
</HarvestDirectory>
72+
<BindPath Include="$(SolutionDir)$ServiceName$/bin/$(Configuration)/net8.0/runtimes/win"/>
73+
</ItemGroup>
74+
</Target>
7575
</Project>

‎working/templates/dxmsolution/ServiceProject/ServiceProject.csproj

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<Nullable>enable</Nullable>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<UserSecretsId>dotnet-$ServiceName$-62852eab-befd-4bf5-96a0-b49639a2f070</UserSecretsId>
8-
<AssemblyName>$FullDxmName$</AssemblyName>
9-
<Version>1.0.1</Version>
10-
<RootNamespace>$ServiceNameFull$</RootNamespace>
11-
<ServerGarbageCollection>true</ServerGarbageCollection>
12-
</PropertyGroup>
13-
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0" />
16-
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.0.4" />
17-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<UserSecretsId>dotnet-$ServiceName$-62852eab-befd-4bf5-96a0-b49639a2f070</UserSecretsId>
7+
<AssemblyName>$FullDxmName$</AssemblyName>
8+
<Version>1.0.1</Version>
9+
<RootNamespace>$ServiceNameFull$</RootNamespace>
10+
<ServerGarbageCollection>true</ServerGarbageCollection>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="8.0.0"/>
14+
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.0.4"/>
15+
</ItemGroup>
1816
</Project>

0 commit comments

Comments
 (0)