Skip to content

Commit 304c0f2

Browse files
renemadsenrenemadsen
committed
Trying to add the outputpath.
1 parent 66dccc9 commit 304c0f2

File tree

3 files changed

+55
-8
lines changed

3 files changed

+55
-8
lines changed

‎eFormAPI/Installation/Bundle/InstallBundle.wixproj‎

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -9,7 +9,7 @@
99
<OutputName>Eform Angular Frontend</OutputName>
1010
<OutputType>Bundle</OutputType>
1111
<Name>InstallBundle</Name>
12-
<!--<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
12+
<!--<WixToolPath>$(ProjectDir)..\wix\3.11\</WixToolPath>
1313
<WixTargetsPath>$(WixToolPath)\wix.targets</WixTargetsPath>
1414
<WixTasksPath>wixtasks.dll</WixTasksPath>-->
1515
</PropertyGroup>
@@ -22,6 +22,33 @@
2222
<OutputPath>..\AllowMultipleVersionsBundle\Resources\</OutputPath>
2323
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
2424
</PropertyGroup>
25+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
26+
<DefineConstants>Debug</DefineConstants>
27+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
28+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
29+
</PropertyGroup>
30+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
31+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
32+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
33+
</PropertyGroup>
34+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
35+
<DefineConstants>Debug</DefineConstants>
36+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
37+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
38+
</PropertyGroup>
39+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
40+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
41+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
42+
</PropertyGroup>
43+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ia64' ">
44+
<DefineConstants>Debug</DefineConstants>
45+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
46+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
47+
</PropertyGroup>
48+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ia64' ">
49+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
50+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
51+
</PropertyGroup>
2552
<ItemGroup>
2653
<Compile Include="Bundle.wxs" />
2754
</ItemGroup>
@@ -66,7 +93,7 @@
6693
<ItemGroup>
6794
<EmbeddedResource Include="HyperlinkTheme.wxl" />
6895
</ItemGroup>
69-
<Import Project="$(WixTargetsPath)"/>
96+
<Import Project="$(WixTargetsPath)" />
7097
<!--
7198
To modify your build process, add your task inside one of the targets below and uncomment it.
7299
Other similar extension points exist, see Wix.targets.

‎eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66

7+
<Platforms>AnyCPU;x86;x64</Platforms>
8+
79
</PropertyGroup>
810
<PropertyGroup>
911
<TargetFramework>netcoreapp2.2</TargetFramework>
@@ -14,10 +16,28 @@
1416
<NoWarn>1701;1702;1591;</NoWarn>
1517
</PropertyGroup>
1618

19+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
20+
<DocumentationFile>API.doc.xml</DocumentationFile>
21+
<NoWarn>1701;1702;1591;</NoWarn>
22+
</PropertyGroup>
23+
24+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
25+
<DocumentationFile>API.doc.xml</DocumentationFile>
26+
<NoWarn>1701;1702;1591;</NoWarn>
27+
</PropertyGroup>
28+
1729
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
1830
<OutputPath>bin\</OutputPath>
1931
</PropertyGroup>
2032

33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
34+
<OutputPath>bin\</OutputPath>
35+
</PropertyGroup>
36+
37+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
38+
<OutputPath>bin\</OutputPath>
39+
</PropertyGroup>
40+
2141
<ItemGroup>
2242
<Compile Remove="output\**" />
2343
<Content Remove="output\**" />

‎eFormAPI/eFormAPI.sln‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Global
5454
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|Any CPU.ActiveCfg = Release|Any CPU
5555
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|Any CPU.Build.0 = Release|Any CPU
5656
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|x64.ActiveCfg = Release|Any CPU
57-
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|x86.ActiveCfg = Release|Any CPU
57+
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|x86.ActiveCfg = Release|x86
5858
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5959
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
6060
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -105,16 +105,16 @@ Global
105105
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x64.ActiveCfg = Debug|x64
106106
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x86.ActiveCfg = Debug|x86
107107
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|Any CPU.ActiveCfg = Release|x86
108-
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.ActiveCfg = Release|x86
109-
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.Build.0 = Release|x86
108+
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.ActiveCfg = Release|x64
109+
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.Build.0 = Release|x64
110110
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.ActiveCfg = Release|x86
111111
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.Build.0 = Release|x86
112112
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|Any CPU.ActiveCfg = Debug|x86
113113
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x64.ActiveCfg = Debug|x86
114114
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x86.ActiveCfg = Debug|x86
115115
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|Any CPU.ActiveCfg = Release|x86
116-
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.ActiveCfg = Release|x86
117-
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.Build.0 = Release|x86
116+
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.ActiveCfg = Release|x64
117+
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.Build.0 = Release|x64
118118
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.ActiveCfg = Release|x86
119119
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.Build.0 = Release|x86
120120
EndGlobalSection

0 commit comments

Comments
 (0)