Skip to content

Commit 4391d9b

Browse files
renemadsenrenemadsen
committed
Removing old code from master.
1 parent bdccd2c commit 4391d9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+24
-4873
lines changed

‎eFormAPI/Installation/Bundle/InstallBundle.wixproj‎

Lines changed: 3 additions & 30 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,33 +22,6 @@
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>
5225
<ItemGroup>
5326
<Compile Include="Bundle.wxs" />
5427
</ItemGroup>
@@ -93,7 +66,7 @@
9366
<ItemGroup>
9467
<EmbeddedResource Include="HyperlinkTheme.wxl" />
9568
</ItemGroup>
96-
<Import Project="$(WixTargetsPath)" />
69+
<Import Project="$(WixTargetsPath)"/>
9770
<!--
9871
To modify your build process, add your task inside one of the targets below and uncomment it.
9972
Other similar extension points exist, see Wix.targets.

‎eFormAPI/Installation/MainInstaller/MainInstaller.wixproj‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@
2626
<SuppressValidation>true</SuppressValidation>
2727
<DefineConstants>ClientPath=..\..\..\eform-client; ApiPath=..\..\eformapi.web; LetsEncryptPath=..\..\..\eFormAPI\Installation\letsencrypt</DefineConstants>
2828
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
30-
<OutputPath>..\Bundle\</OutputPath>
31-
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
32-
<SuppressValidation>true</SuppressValidation>
33-
<DefineConstants>ClientPath=..\..\..\eform-client; ApiPath=..\..\eformapi.web; LetsEncryptPath=..\..\..\eFormAPI\Installation\letsencrypt</DefineConstants>
34-
</PropertyGroup>
3529
<ItemGroup>
3630
<Compile Include="ApiFileList.wxs" />
3731
<Compile Include="ExitDlgModified.wxs" />
@@ -100,6 +94,19 @@
10094
<PropertyGroup>
10195
<PostBuildEvent>"$(ProjectDir)BuildedCustomActions\AllowMultipleVersions.exe" "$(TargetPath)"</PostBuildEvent>
10296
</PropertyGroup>
97+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
98+
<DefineConstants>Debug</DefineConstants>
99+
<SuppressAllWarnings>False</SuppressAllWarnings>
100+
<SuppressValidation>True</SuppressValidation>
101+
<Pedantic>True</Pedantic>
102+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
103+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
104+
</PropertyGroup>
105+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
106+
<SuppressValidation>true</SuppressValidation>
107+
<OutputPath>..\Bundle\</OutputPath>
108+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
109+
</PropertyGroup>
103110
<!--
104111
To modify your build process, add your task inside one of the targets below and uncomment it.
105112
Other similar extension points exist, see Wix.targets.

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

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

55
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
66

7-
<Platforms>AnyCPU;x86;x64</Platforms>
8-
97
</PropertyGroup>
108
<PropertyGroup>
119
<TargetFramework>netcoreapp2.2</TargetFramework>
@@ -16,28 +14,10 @@
1614
<NoWarn>1701;1702;1591;</NoWarn>
1715
</PropertyGroup>
1816

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-
2917
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
3018
<OutputPath>bin\</OutputPath>
3119
</PropertyGroup>
3220

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-
4121
<ItemGroup>
4222
<Compile Remove="output\**" />
4323
<Content Remove="output\**" />

‎eFormAPI/eFormAPI.sln‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ 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|x86
57+
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|x86.ActiveCfg = Release|Any CPU
58+
{701DF5E7-71CC-4187-835F-2C9E8056956B}.Release|x86.Build.0 = Release|Any CPU
5859
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5960
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|Any CPU.Build.0 = Debug|Any CPU
6061
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -65,6 +66,7 @@ Global
6566
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Release|Any CPU.Build.0 = Release|Any CPU
6667
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Release|x64.ActiveCfg = Release|Any CPU
6768
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Release|x86.ActiveCfg = Release|Any CPU
69+
{703802AA-5C65-43F0-8DFE-C81954EE7B04}.Release|x86.Build.0 = Release|Any CPU
6870
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6971
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Debug|Any CPU.Build.0 = Debug|Any CPU
7072
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -75,6 +77,7 @@ Global
7577
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Release|Any CPU.Build.0 = Release|Any CPU
7678
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Release|x64.ActiveCfg = Release|Any CPU
7779
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Release|x86.ActiveCfg = Release|Any CPU
80+
{608BF97D-0220-4EAC-9BCC-7C3FBC50A7D6}.Release|x86.Build.0 = Release|Any CPU
7881
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|Any CPU.ActiveCfg = Debug|x86
7982
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x64.ActiveCfg = Debug|x64
8083
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|x86.ActiveCfg = Debug|x86
@@ -105,16 +108,16 @@ Global
105108
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x64.ActiveCfg = Debug|x64
106109
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Debug|x86.ActiveCfg = Debug|x86
107110
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|Any CPU.ActiveCfg = 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
111+
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.ActiveCfg = Release|x86
112+
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x64.Build.0 = Release|x86
110113
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.ActiveCfg = Release|x86
111114
{2B339DEF-FB4F-4987-A361-8B95410C438B}.Release|x86.Build.0 = Release|x86
112115
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|Any CPU.ActiveCfg = Debug|x86
113116
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x64.ActiveCfg = Debug|x86
114117
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Debug|x86.ActiveCfg = Debug|x86
115118
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|Any CPU.ActiveCfg = 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
119+
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.ActiveCfg = Release|x86
120+
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x64.Build.0 = Release|x86
118121
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.ActiveCfg = Release|x86
119122
{B63F5F50-AA5B-4BC2-AC61-B2A94B62C042}.Release|x86.Build.0 = Release|x86
120123
EndGlobalSection

‎eFormAPI/eFormAPI/App_Start/AutofacConfig.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎eFormAPI/eFormAPI/App_Start/Startup.Auth.cs‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

0 commit comments

Comments
 (0)