Skip to content

Commit 262d0de

Browse files
SteveIvesSteveIves
committed
Put FileService back the way it was!
1 parent 55919ad commit 262d0de

5 files changed

Lines changed: 53 additions & 51 deletions

File tree

‎FileService/FileService.synproj‎

Lines changed: 38 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
3333
<DebugOptimize>Debug</DebugOptimize>
3434
<DocumentationFile>bin\Debug\FileService.xml</DocumentationFile>
35-
<TargetRuntimeLevel>11010100</TargetRuntimeLevel>
36-
<UnevaluatedOutputPath>bin\Debug\</UnevaluatedOutputPath>
37-
<Prefer32Bit>False</Prefer32Bit>
35+
<Prefer32Bit Condition=" '$(TargetFrameworkVersion)' != 'v4.0' AND '$(Prefer32Bit)' != 'false' ">true</Prefer32Bit>
3836
</PropertyGroup>
3937
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
4038
<IncludeDebugInformation>true</IncludeDebugInformation>
@@ -43,31 +41,32 @@
4341
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
4442
<DebugOptimize>Optimize</DebugOptimize>
4543
<DocumentationFile>bin\Release\FileService.xml</DocumentationFile>
44+
<Prefer32Bit Condition=" '$(TargetFrameworkVersion)' != 'v4.0' AND '$(Prefer32Bit)' != 'false' ">true</Prefer32Bit>
4645
<UnevaluatedOutputPath>bin\Release\</UnevaluatedOutputPath>
4746
<Prefer32Bit>False</Prefer32Bit>
48-
<TargetRuntimeLevel>11010100</TargetRuntimeLevel>
49-
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
51-
<IncludeDebugInformation>true</IncludeDebugInformation>
52-
<PlatformTarget>AnyCPU</PlatformTarget>
53-
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
54-
<DebugOptimize>Optimize</DebugOptimize>
55-
<DocumentationFile>bin\Release\FileService.xml</DocumentationFile>
56-
<UnevaluatedOutputPath>bin\AnyCPU\Deploy\</UnevaluatedOutputPath>
57-
<Prefer32Bit>False</Prefer32Bit>
58-
<OutputPath>bin\AnyCPU\Deploy\</OutputPath>
59-
<TargetRuntimeLevel>11010100</TargetRuntimeLevel>
6047
</PropertyGroup>
6148
<ItemGroup>
62-
<PackageReference Include="Owin" Version="1.0.0" />
63-
<PackageReference Include="Microsoft.Owin" Version="4.2.2" />
64-
<PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.2.2" />
65-
<PackageReference Include="Microsoft.Owin.Hosting" Version="4.2.2" />
66-
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
67-
<PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.9" />
68-
<PackageReference Include="Microsoft.AspNet.WebApi.Owin" Version="5.2.9" />
69-
<PackageReference Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.9" />
49+
<Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
50+
<HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
51+
<Private>true</Private>
52+
</Reference>
53+
<Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
54+
<HintPath>..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
55+
<Private>true</Private>
56+
</Reference>
57+
<Reference Include="Microsoft.Owin.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
58+
<HintPath>..\packages\Microsoft.Owin.Hosting.4.0.0\lib\net451\Microsoft.Owin.Hosting.dll</HintPath>
59+
<Private>true</Private>
60+
</Reference>
7061
<Reference Include="mscorlib" />
62+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed">
63+
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
64+
<Private>true</Private>
65+
</Reference>
66+
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5">
67+
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
68+
<Private>true</Private>
69+
</Reference>
7170
<Reference Include="synrnt">
7271
<Private>False</Private>
7372
</Reference>
@@ -77,8 +76,24 @@
7776
<Reference Include="System.Data" />
7877
<Reference Include="System.Management" />
7978
<Reference Include="System.Net.Http" />
79+
<Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
80+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
81+
<Private>true</Private>
82+
</Reference>
8083
<Reference Include="System.ServiceProcess" />
8184
<Reference Include="System.Web" />
85+
<Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
86+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
87+
<Private>true</Private>
88+
</Reference>
89+
<Reference Include="System.Web.Http.Owin, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
90+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Owin.5.2.4\lib\net45\System.Web.Http.Owin.dll</HintPath>
91+
<Private>true</Private>
92+
</Reference>
93+
<Reference Include="System.Web.Http.WebHost, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
94+
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.4\lib\net45\System.Web.Http.WebHost.dll</HintPath>
95+
<Private>true</Private>
96+
</Reference>
8297
</ItemGroup>
8398
<ItemGroup>
8499
<Compile Include="FileService.dbl">

‎FileService/Properties/AssemblyInfo.dbl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import System.Runtime.InteropServices
1010
{assembly: AssemblyConfiguration("")}
1111
{assembly: AssemblyCompany("")}
1212
{assembly: AssemblyProduct("FileService")}
13-
{assembly: AssemblyCopyright("Copyright © Synergex International Corporation, 2022")}
13+
{assembly: AssemblyCopyright("Copyright © Synergex International Corporation, 2018")}
1414
{assembly: AssemblyTrademark("")}
1515
{assembly: AssemblyCulture("")}
1616

@@ -29,5 +29,5 @@ import System.Runtime.InteropServices
2929
; Build Number
3030
; Revision
3131
;
32-
{assembly: AssemblyVersion("1.2.0.0")}
33-
{assembly: AssemblyFileVersion("1.2.0.0")}
32+
{assembly: AssemblyVersion("1.0.0.0")}
33+
{assembly: AssemblyFileVersion("1.1.0.0")}

‎FileService/packages.config‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi" version="5.2.9" targetFramework="net472" />
4-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net472" />
5-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net472" />
6-
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net472" />
7-
<package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.9" targetFramework="net472" />
8-
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net472" />
9-
<package id="Microsoft.Owin" version="4.2.2" targetFramework="net472" />
10-
<package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net472" />
11-
<package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net472" />
12-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
3+
<package id="Microsoft.AspNet.WebApi" version="5.2.4" targetFramework="net461" />
4+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net461" />
5+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net461" />
6+
<package id="Microsoft.AspNet.WebApi.Owin" version="5.2.4" targetFramework="net461" />
7+
<package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.4" targetFramework="net461" />
8+
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.4" targetFramework="net461" />
9+
<package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
10+
<package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net461" />
11+
<package id="Microsoft.Owin.Hosting" version="4.0.0" targetFramework="net461" />
12+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
1313
<package id="Owin" version="1.0" targetFramework="net461" />
1414
</packages>

‎FileServiceSetup/FileServiceSetup.wixproj‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,6 @@
6363
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
6464
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
6565
</Target>
66-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|x86' ">
67-
<SuppressSpecificWarnings>1076</SuppressSpecificWarnings>
68-
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
69-
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
70-
</PropertyGroup>
71-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
72-
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
73-
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
74-
</PropertyGroup>
75-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|Any CPU' ">
76-
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
77-
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
78-
</PropertyGroup>
7966
<PropertyGroup>
8067
<PostBuildEvent />
8168
</PropertyGroup>

‎FileServiceSetup/Product.wxs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
<Product
1212
Name="File Service"
13-
Version="1.2"
14-
Id="{CE916019-B608-4471-9B04-74EB257124FE}"
13+
Version="1.1"
14+
Id="{B1369A80-59B2-407C-94F1-AFEB9AEE2053}"
1515
Language="1033"
1616
Manufacturer="Synergex International Corporation"
1717
UpgradeCode="{D610D7F5-5DCC-4E46-A4C9-A393B53790D7}">

0 commit comments

Comments
 (0)