Skip to content

Commit 22a054f

Browse files
daisukenishino2daisukenishino2
committed
fixed #13 
1 parent 764c79e commit 22a054f

File tree

5 files changed

+39
-71
lines changed

5 files changed

+39
-71
lines changed

‎root/programs/10_ASPNETWebService.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ rem --------------------------------------------------
1919
rem Batch build of ASPNETWebService.
2020
rem --------------------------------------------------
2121
nuget.exe restore "ASPNETWebService\ASPNETWebService.sln"
22-
%BUILDFILEPATH% %COMMANDLINE% /t:Restore "ASPNETWebService\ASPNETWebService.sln"
22+
%BUILDFILEPATH% %COMMANDLINE% "ASPNETWebService\ASPNETWebService.sln"
23+
2324

2425
pause
2526

‎root/programs/6_Build_WSSrv_sample.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ call %CURRENT_DIR%z_Common.bat
1818
rem --------------------------------------------------
1919
rem Batch build of WSServer_sample.
2020
rem --------------------------------------------------
21-
%BUILDFILEPATH% %COMMANDLINE% /t:Restore "WS_sample\WSServer_sample\WSServer_sample.sln"
21+
..\nuget.exe restore "WS_sample\WSServer_sample\WSServer_sample.sln"
22+
%BUILDFILEPATH% %COMMANDLINE% "WS_sample\WSServer_sample\WSServer_sample.sln"
2223

2324
pause
2425

‎root/programs/WS_sample/WSServer_sample/WSServer_sample.csproj

Lines changed: 17 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
2+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>8.0.50727</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}</ProjectGuid>
7+
<ProjectGuid>{FA674CFA-F91C-4E05-B87E-93F5A052E614}</ProjectGuid>
98
<OutputType>Library</OutputType>
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>WSServer_sample</RootNamespace>
1211
<AssemblyName>WSServer_sample</AssemblyName>
1312
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
14-
<FileUpgradeFlags>
15-
</FileUpgradeFlags>
16-
<OldToolsVersion>2.0</OldToolsVersion>
17-
<UpgradeBackupLocation />
13+
<FileAlignment>512</FileAlignment>
1814
<TargetFrameworkProfile />
19-
<PublishUrl>publish\</PublishUrl>
20-
<Install>true</Install>
21-
<InstallFrom>Disk</InstallFrom>
22-
<UpdateEnabled>false</UpdateEnabled>
23-
<UpdateMode>Foreground</UpdateMode>
24-
<UpdateInterval>7</UpdateInterval>
25-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26-
<UpdatePeriodically>false</UpdatePeriodically>
27-
<UpdateRequired>false</UpdateRequired>
28-
<MapFileExtensions>true</MapFileExtensions>
29-
<ApplicationRevision>0</ApplicationRevision>
30-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<IsWebBootstrapper>false</IsWebBootstrapper>
32-
<UseApplicationTrust>false</UseApplicationTrust>
33-
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
3515
</PropertyGroup>
3616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3717
<DebugSymbols>true</DebugSymbols>
@@ -41,7 +21,6 @@
4121
<DefineConstants>DEBUG;TRACE</DefineConstants>
4222
<ErrorReport>prompt</ErrorReport>
4323
<WarningLevel>4</WarningLevel>
44-
<Prefer32Bit>false</Prefer32Bit>
4524
<DocumentationFile>..\..\OpenTouryoAssemblies\Build_net48\WSServer_sample.xml</DocumentationFile>
4625
</PropertyGroup>
4726
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -51,9 +30,12 @@
5130
<DefineConstants>TRACE</DefineConstants>
5231
<ErrorReport>prompt</ErrorReport>
5332
<WarningLevel>4</WarningLevel>
54-
<Prefer32Bit>false</Prefer32Bit>
5533
</PropertyGroup>
5634
<ItemGroup>
35+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
36+
<HintPath>packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
37+
<Private>True</Private>
38+
</Reference>
5739
<Reference Include="OpenTouryo.Business">
5840
<HintPath>..\..\OpenTouryoAssemblies\Build_net48\OpenTouryo.Business.dll</HintPath>
5941
</Reference>
@@ -64,7 +46,12 @@
6446
<HintPath>..\..\OpenTouryoAssemblies\Build_net48\OpenTouryo.Public.dll</HintPath>
6547
</Reference>
6648
<Reference Include="System" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="System.Xml.Linq" />
51+
<Reference Include="System.Data.DataSetExtensions" />
52+
<Reference Include="Microsoft.CSharp" />
6753
<Reference Include="System.Data" />
54+
<Reference Include="System.Net.Http" />
6855
<Reference Include="System.Xml" />
6956
</ItemGroup>
7057
<ItemGroup>
@@ -77,30 +64,20 @@
7764
</ItemGroup>
7865
<ItemGroup>
7966
<ProjectReference Include="..\WSIFType_sample\WSIFType_sample.csproj">
80-
<Project>{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}</Project>
67+
<Project>{e4ecbb27-684e-49c2-b0f5-6cefe33f4bdb}</Project>
8168
<Name>WSIFType_sample</Name>
8269
</ProjectReference>
8370
</ItemGroup>
8471
<ItemGroup>
85-
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop">
86-
<Version>1.16.30</Version>
87-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
88-
<PrivateAssets>all</PrivateAssets>
89-
</PackageReference>
90-
<PackageReference Include="Newtonsoft.Json">
91-
<Version>12.0.2</Version>
92-
</PackageReference>
72+
<None Include="app.config" />
73+
<None Include="packages.config" />
9374
</ItemGroup>
94-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
75+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9576
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9677
Other similar extension points exist, see Microsoft.Common.targets.
9778
<Target Name="BeforeBuild">
9879
</Target>
9980
<Target Name="AfterBuild">
10081
</Target>
10182
-->
102-
<PropertyGroup>
103-
<PostBuildEvent>
104-
</PostBuildEvent>
105-
</PropertyGroup>
10683
</Project>

‎root/programs/WS_sample/WSServer_sample/WSServer_sample.sln

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,28 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29209.62
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{FA674CFA-F91C-4E05-B87E-93F5A052E614}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSIFType_sample", "..\WSIFType_sample\WSIFType_sample.csproj", "{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|.NET = Debug|.NET
1312
Debug|Any CPU = Debug|Any CPU
14-
Debug|Mixed Platforms = Debug|Mixed Platforms
15-
Release|.NET = Release|.NET
1613
Release|Any CPU = Release|Any CPU
17-
Release|Mixed Platforms = Release|Mixed Platforms
1814
EndGlobalSection
1915
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Debug|.NET.ActiveCfg = Debug|Any CPU
21-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
24-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
25-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Release|.NET.ActiveCfg = Release|Any CPU
26-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
27-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Release|Any CPU.Build.0 = Release|Any CPU
28-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
29-
{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
30-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Debug|.NET.ActiveCfg = Debug|Any CPU
16+
{FA674CFA-F91C-4E05-B87E-93F5A052E614}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{FA674CFA-F91C-4E05-B87E-93F5A052E614}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{FA674CFA-F91C-4E05-B87E-93F5A052E614}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{FA674CFA-F91C-4E05-B87E-93F5A052E614}.Release|Any CPU.Build.0 = Release|Any CPU
3120
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3221
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
34-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
35-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Release|.NET.ActiveCfg = Release|Any CPU
3622
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
3723
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Release|Any CPU.Build.0 = Release|Any CPU
38-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
39-
{E4ECBB27-684E-49C2-B0F5-6CEFE33F4BDB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4024
EndGlobalSection
4125
GlobalSection(SolutionProperties) = preSolution
4226
HideSolutionNode = FALSE
4327
EndGlobalSection
44-
GlobalSection(ExtensibilityGlobals) = postSolution
45-
SolutionGuid = {04A7AC1E-9D6D-4F8D-A134-1E18668BBF47}
46-
EndGlobalSection
47-
GlobalSection(DPCodeReviewSolutionGUID) = preSolution
48-
DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
49-
EndGlobalSection
5028
EndGlobal

‎root/programs/WS_sample/WSServer_sample/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>

0 commit comments

Comments
 (0)