Skip to content

Commit fb88795

Browse files
hatashinyahatashinya
authored
Merge pull request #3 from hatashinya/tls
TLS 1.1/1.2
2 parents 808bd80 + 347ae6c commit fb88795

File tree

11 files changed

+46
-48
lines changed

11 files changed

+46
-48
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ obj
44
Debug
55
Release
66
*.user
7+
.vs

‎CBLabs.CybozuConnect/App.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ public XmlElement Exec(string service, string method, ListDictionary parameters)
151151
throw new CybozuException("Unexpected");
152152
}
153153

154+
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;
155+
154156
WebRequest request = WebRequest.Create(url);
155157
request.Method = "POST";
156158
request.ContentType = string.Format("application/soap+xml; charset=utf-8; action=\"{0}\"", method);

‎CBLabs.CybozuConnect/CBLabs.CybozuConnect.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>CBLabs.CybozuConnect</RootNamespace>
1212
<AssemblyName>CBLabs.CybozuConnect</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
15-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15+
<TargetFrameworkProfile>
16+
</TargetFrameworkProfile>
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
2223
<DefineConstants>DEBUG;TRACE</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2729
<DebugType>pdbonly</DebugType>
@@ -30,6 +32,7 @@
3032
<DefineConstants>TRACE</DefineConstants>
3133
<ErrorReport>prompt</ErrorReport>
3234
<WarningLevel>4</WarningLevel>
35+
<Prefer32Bit>false</Prefer32Bit>
3336
</PropertyGroup>
3437
<ItemGroup>
3538
<Reference Include="System" />

‎CBLabs.CybozuConnect/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.*")]
3636
//[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: AssemblyInformationalVersion("1.0.5")]
37+
[assembly: AssemblyInformationalVersion("1.0.6")]

‎Cybozu.CrossSync Setup/Cybozu.CrossSync Setup.vdproj‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
"Entry"
7171
{
7272
"MsmKey" = "8:_UNDEFINED"
73-
"OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33"
73+
"OwnerKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106"
7474
"MsmSig" = "8:_UNDEFINED"
7575
}
7676
"Entry"
7777
{
7878
"MsmKey" = "8:_UNDEFINED"
79-
"OwnerKey" = "8:_09FEF9D5331D4F6C8D8D3ED69E020106"
79+
"OwnerKey" = "8:_086B4B3C691D4C13B634EF324B765A33"
8080
"MsmSig" = "8:_UNDEFINED"
8181
}
8282
}
@@ -87,7 +87,7 @@
8787
"DisplayName" = "8:Debug"
8888
"IsDebugOnly" = "11:TRUE"
8989
"IsReleaseOnly" = "11:FALSE"
90-
"OutputFilename" = "8:Debug\\CrossSync-1.0.5.msi"
90+
"OutputFilename" = "8:Debug\\CrossSync-1.0.6.msi"
9191
"PackageFilesAs" = "3:2"
9292
"PackageFileSize" = "3:-2147483648"
9393
"CabType" = "3:1"
@@ -106,11 +106,6 @@
106106
"ComponentsUrl" = "8:"
107107
"Items"
108108
{
109-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Client.3.5"
110-
{
111-
"Name" = "8:.NET Framework 3.5 SP1 Client Profile"
112-
"ProductCode" = "8:Microsoft.Net.Client.3.5"
113-
}
114109
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
115110
{
116111
"Name" = "8:Windows インストーラー 3.1"
@@ -124,7 +119,7 @@
124119
"DisplayName" = "8:Release"
125120
"IsDebugOnly" = "11:FALSE"
126121
"IsReleaseOnly" = "11:TRUE"
127-
"OutputFilename" = "8:Release\\CrossSync-1.0.5.msi"
122+
"OutputFilename" = "8:Release\\CrossSync-1.0.6.msi"
128123
"PackageFilesAs" = "3:2"
129124
"PackageFileSize" = "3:-2147483648"
130125
"CabType" = "3:1"
@@ -143,11 +138,6 @@
143138
"ComponentsUrl" = "8:"
144139
"Items"
145140
{
146-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Net.Client.3.5"
147-
{
148-
"Name" = "8:.NET Framework 3.5 SP1 Client Profile"
149-
"ProductCode" = "8:Microsoft.Net.Client.3.5"
150-
}
151141
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.3.1"
152142
{
153143
"Name" = "8:Windows インストーラー 3.1"
@@ -232,7 +222,7 @@
232222
{
233223
"Name" = "8:.NET Framework"
234224
"Message" = "8:[VSDNETMSG]"
235-
"FrameworkVersion" = "8:.NETFramework,Version=v3.5,Profile=Client"
225+
"FrameworkVersion" = "8:.NETFramework,Version=v4.5"
236226
"AllowLaterVersions" = "11:FALSE"
237227
"InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=131000"
238228
}
@@ -244,7 +234,7 @@
244234
{
245235
"AssemblyRegister" = "3:1"
246236
"AssemblyIsInGAC" = "11:FALSE"
247-
"AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.5491.32387, Culture=neutral, processorArchitecture=MSIL"
237+
"AssemblyAsmDisplayName" = "8:CBLabs.CybozuConnect, Version=1.0.6702.28349, Culture=neutral, processorArchitecture=MSIL"
248238
"ScatterAssemblies"
249239
{
250240
"_09FEF9D5331D4F6C8D8D3ED69E020106"
@@ -438,20 +428,20 @@
438428
{
439429
"Name" = "8:Microsoft Visual Studio"
440430
"ProductName" = "8:Cybozu CrossSync"
441-
"ProductCode" = "8:{840E0454-6B8F-4228-A1D5-F6E09A650102}"
442-
"PackageCode" = "8:{5763D3C6-15E8-4BC1-B7B6-71C3CF4790C9}"
431+
"ProductCode" = "8:{7513DA0F-C465-4A7B-B970-C021E31AED09}"
432+
"PackageCode" = "8:{7A868061-957A-407C-81C5-97C6FDFD6CA1}"
443433
"UpgradeCode" = "8:{64C6CDDD-B1F1-4D42-8DAD-00A63A741633}"
444434
"AspNetVersion" = "8:4.0.30319.0"
445435
"RestartWWWService" = "11:FALSE"
446436
"RemovePreviousVersions" = "11:TRUE"
447437
"DetectNewerInstalledVersion" = "11:TRUE"
448438
"InstallAllUsers" = "11:FALSE"
449-
"ProductVersion" = "8:1.0.5"
439+
"ProductVersion" = "8:1.0.6"
450440
"Manufacturer" = "8:Cybozu Labs"
451441
"ARPHELPTELEPHONE" = "8:"
452442
"ARPHELPLINK" = "8:"
453443
"Title" = "8:Cybozu CrossSync Setup"
454-
"Subject" = "8:Cybozu CrossSync 1.0.5"
444+
"Subject" = "8:Cybozu CrossSync 1.0.6"
455445
"ARPCONTACT" = "8:Cybozu Labs, Inc."
456446
"Keywords" = "8:"
457447
"ARPCOMMENTS" = "8:"

‎Cybozu.CrossSync/Cybozu.CrossSync.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Cybozu.CrossSync</RootNamespace>
1212
<AssemblyName>CrossSync</AssemblyName>
13-
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
14-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1516
<FileAlignment>512</FileAlignment>
1617
<IsWebBootstrapper>false</IsWebBootstrapper>
1718
<PublishUrl>publish\</PublishUrl>
@@ -38,6 +39,7 @@
3839
<DefineConstants>DEBUG;TRACE</DefineConstants>
3940
<ErrorReport>prompt</ErrorReport>
4041
<WarningLevel>4</WarningLevel>
42+
<Prefer32Bit>false</Prefer32Bit>
4143
</PropertyGroup>
4244
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
4345
<PlatformTarget>x86</PlatformTarget>
@@ -47,6 +49,7 @@
4749
<DefineConstants>TRACE</DefineConstants>
4850
<ErrorReport>prompt</ErrorReport>
4951
<WarningLevel>4</WarningLevel>
52+
<Prefer32Bit>false</Prefer32Bit>
5053
</PropertyGroup>
5154
<PropertyGroup>
5255
<ApplicationIcon>CrossSync.ico</ApplicationIcon>

‎Cybozu.CrossSync/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.*")]
3636
//[assembly: AssemblyFileVersion("1.0.0.0")]
37-
[assembly: AssemblyInformationalVersion("1.0.5")]
37+
[assembly: AssemblyInformationalVersion("1.0.6")]

‎Cybozu.CrossSync/Properties/Settings.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cybozu.CrossSync/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cybozu.CrossSync/app.config‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
<?xml version="1.0"?>
22
<configuration>
33
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="Cybozu.CrossSync.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
5+
<section name="Cybozu.CrossSync.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
66
</sectionGroup>
77
</configSections>
8-
<startup><supportedRuntime version="v2.0.50727" sku="Client"/></startup><userSettings>
8+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup><userSettings>
99
<Cybozu.CrossSync.Properties.Settings>
1010
<setting name="FirstUrl" serializeAs="String">
11-
<value />
11+
<value/>
1212
</setting>
1313
<setting name="FirstUsername" serializeAs="String">
14-
<value />
14+
<value/>
1515
</setting>
1616
<setting name="FirstPassword" serializeAs="String">
17-
<value />
17+
<value/>
1818
</setting>
1919
<setting name="FirstPostfix" serializeAs="String">
20-
<value />
20+
<value/>
2121
</setting>
2222
<setting name="SecondUrl" serializeAs="String">
23-
<value />
23+
<value/>
2424
</setting>
2525
<setting name="SecondUsername" serializeAs="String">
26-
<value />
26+
<value/>
2727
</setting>
2828
<setting name="SecondPassword" serializeAs="String">
29-
<value />
29+
<value/>
3030
</setting>
3131
<setting name="SecondPostfix" serializeAs="String">
32-
<value />
32+
<value/>
3333
</setting>
3434
<setting name="AllDay" serializeAs="String">
3535
<value>True</value>
@@ -50,7 +50,7 @@
5050
<value>60</value>
5151
</setting>
5252
<setting name="LastSynchronized" serializeAs="String">
53-
<value />
53+
<value/>
5454
</setting>
5555
<setting name="Upgraded" serializeAs="String">
5656
<value>False</value>

0 commit comments

Comments
 (0)