diff --git a/root/programs/CS/0_ExecAllBat.bat b/root/programs/CS/0_ExecAllBat.bat index 6d6fdeea2..04b288f5d 100644 --- a/root/programs/CS/0_ExecAllBat.bat +++ b/root/programs/CS/0_ExecAllBat.bat @@ -1,13 +1,6 @@ @echo on timeout 5 -echo | call 1_DeleteDir.bat -echo | call 1_DeleteFile.bat -echo | call 2_Build_NuGet_netstd20.bat - -@echo on -timeout 5 - echo | call 1_DeleteDir.bat echo | call 1_DeleteFile.bat echo | call 2_Build_NuGet_net48.bat @@ -19,9 +12,9 @@ timeout 5 echo | call 1_DeleteDir.bat echo | call 1_DeleteFile.bat -echo | call 2_Build_NuGet_nettcore80.bat -echo | call 3_Build_Business_netcore80.bat -echo | call 3_Build_BusinessRichClient_netcore80.bat +echo | call 2_Build_NuGet_nettcore100.bat +echo | call 3_Build_Business_netcore100.bat +echo | call 3_Build_BusinessRichClient_netcore100.bat @echo on timeout 5 diff --git a/root/programs/CS/0_Release4Nuget.bat b/root/programs/CS/0_Release4Nuget.bat index c87bbf5a9..a2e6fa2f1 100644 --- a/root/programs/CS/0_Release4Nuget.bat +++ b/root/programs/CS/0_Release4Nuget.bat @@ -1,12 +1,6 @@ @echo on timeout 5 -echo | call 1_DeleteDir.bat -echo | call 2_Build_NuGet_netstd20.bat - -@echo on -timeout 5 - echo | call 1_DeleteDir.bat echo | call 2_Build_NuGet_net48.bat diff --git a/root/programs/CS/2_Build_NuGet_nettcore80.bat b/root/programs/CS/2_Build_NuGet_netcore100.bat similarity index 87% rename from root/programs/CS/2_Build_NuGet_nettcore80.bat rename to root/programs/CS/2_Build_NuGet_netcore100.bat index c2d21c448..09511489a 100644 --- a/root/programs/CS/2_Build_NuGet_nettcore80.bat +++ b/root/programs/CS/2_Build_NuGet_netcore100.bat @@ -18,11 +18,11 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure rem -------------------------------------------------- -call dotnet restore "Frameworks\Infrastructure\Nuget_netcore80.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore80.sln" +call dotnet restore "Frameworks\Infrastructure\Nuget_netcore100.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_netcore100.sln" -call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore80.sln" +call dotnet restore "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Nuget_RichClient_netcore100.sln" pause diff --git a/root/programs/CS/3_Build_BusinessRichClient_netcore80.bat b/root/programs/CS/3_Build_BusinessRichClient_netcore100.bat similarity index 94% rename from root/programs/CS/3_Build_BusinessRichClient_netcore80.bat rename to root/programs/CS/3_Build_BusinessRichClient_netcore100.bat index d1b89515c..ceee461c5 100644 --- a/root/programs/CS/3_Build_BusinessRichClient_netcore80.bat +++ b/root/programs/CS/3_Build_BusinessRichClient_netcore100.bat @@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure rem -------------------------------------------------- -call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore80.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore80.sln" +call dotnet restore "Frameworks\Infrastructure\BusinessRichClient_netcore100.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\BusinessRichClient_netcore100.sln" pause diff --git a/root/programs/CS/3_Build_Business_netcore80.bat b/root/programs/CS/3_Build_Business_netcore100.bat similarity index 89% rename from root/programs/CS/3_Build_Business_netcore80.bat rename to root/programs/CS/3_Build_Business_netcore100.bat index 35dd5595f..02a4e126d 100644 --- a/root/programs/CS/3_Build_Business_netcore80.bat +++ b/root/programs/CS/3_Build_Business_netcore100.bat @@ -18,8 +18,8 @@ call %CURRENT_DIR%z_Common.bat rem -------------------------------------------------- rem Build the batch Infrastructure rem -------------------------------------------------- -call dotnet restore "Frameworks\Infrastructure\Business_netcore80.sln" -call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore80.sln" +call dotnet restore "Frameworks\Infrastructure\Business_netcore100.sln" +call dotnet msbuild %COMMANDLINE% "Frameworks\Infrastructure\Business_netcore100.sln" pause diff --git a/root/programs/CS/4_Build_Framework_Tool.bat b/root/programs/CS/4_Build_Framework_Tool.bat index 990c11678..fcce053e2 100644 --- a/root/programs/CS/4_Build_Framework_Tool.bat +++ b/root/programs/CS/4_Build_Framework_Tool.bat @@ -31,13 +31,5 @@ rem -------------------------------------------------- pause -rem -------------------------------------------------- -rem Batch build of Deploy ZipPack With HTTP. -rem -------------------------------------------------- -..\nuget.exe restore "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln" -%BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tools\DeployZipPackWithHTTP\DeployZipPackWithHTTP.sln" - -pause - rem ------------------------------------------------------- endlocal diff --git a/root/programs/CS/6_Build_WSSrvCore_sample.bat b/root/programs/CS/6_Build_WSSrvCore_sample.bat index 8e525a2c6..b44c0ca7a 100644 --- a/root/programs/CS/6_Build_WSSrvCore_sample.bat +++ b/root/programs/CS/6_Build_WSSrvCore_sample.bat @@ -27,8 +27,8 @@ rem -------------------------------------------------- dotnet restore "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" dotnet msbuild %COMMANDLINE% "Samples4NetCore\Legacy\WS_sample\WSServer_sample\WSServer_sample.sln" -xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net8.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net8.0\" -xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net8.0" "Samples4NetCore\Legacy\WS_sample\Build\net8.0\" +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\WSServer_sample\bin\%BUILD_CONFIG%\net10.0" "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net10.0\" +xcopy /E /Y "Samples4NetCore\Legacy\WS_sample\Temp\%BUILD_CONFIG%\net10.0" "Samples4NetCore\Legacy\WS_sample\Build\net10.0\" pause diff --git a/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore100.csproj similarity index 78% rename from root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore100.csproj index a9967dfbf..436310300 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Business/Business_netcore100.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 Touryo.Infrastructure.Business OpenTouryo.Business true @@ -9,8 +9,8 @@ TRACE;DEBUG;NETCOREAPP - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Business.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Business.xml full true 1701;1702;NU1701 @@ -18,8 +18,8 @@ TRACE;NETCOREAPP - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Business.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Business.xml portable true 1701;1702;NU1701 @@ -69,22 +69,22 @@ - ..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore100.csproj similarity index 58% rename from root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore100.csproj index ad1a73ea3..a1bc4fa3d 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Business/RichClient/Business.RichClient_netcore100.csproj @@ -2,7 +2,7 @@ Library - net8.0-windows7.0 + net10.0-windows7.0 true true OpenTouryo.Business.RichClient @@ -11,8 +11,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml full true 1701;1702;NU1701 @@ -20,8 +20,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.xml portable true 1701;1702;NU1701 @@ -33,25 +33,25 @@ - ..\..\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.Public.dll @@ -59,8 +59,4 @@ - - - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln index 0b30f1fd3..1dcd632b4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln +++ b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_net48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business.RichClient_net48", "Business\RichClient\Business.RichClient_net48.csproj", "{46E0BD62-9451-431C-A75F-EE7B8CC5D6D9}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore80.sln b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore100.sln similarity index 80% rename from root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore80.sln rename to root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore100.sln index a35e444d5..f8780c935 100644 --- a/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore80.sln +++ b/root/programs/CS/Frameworks/Infrastructure/BusinessRichClient_netcore100.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11012.119 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore80", "Business\RichClient\Business.RichClient_netcore80.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business.RichClient_netcore100", "Business\RichClient\Business.RichClient_netcore100.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore80", "CustomControl\RichClient\CustomControl.RichClient_netcore80.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomControl.RichClient_netcore100", "CustomControl\RichClient\CustomControl.RichClient_netcore100.csproj", "{7F43B77D-7B02-4C18-94CC-4B1348CDEB57}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln b/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln index 6581e075e..ad8d099ea 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Business_net48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30717.126 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Business_net48", "Business\Business_net48.csproj", "{7187571A-3A26-4363-9AB6-189CB5B58422}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Business_netcore80.sln b/root/programs/CS/Frameworks/Infrastructure/Business_netcore100.sln similarity index 85% rename from root/programs/CS/Frameworks/Infrastructure/Business_netcore80.sln rename to root/programs/CS/Frameworks/Infrastructure/Business_netcore100.sln index 72e36e8d2..41f58fa3f 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Business_netcore80.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Business_netcore100.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore80", "Business\Business_netcore80.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Business_netcore100", "Business\Business_netcore100.csproj", "{87C03805-26A4-452B-97C7-2C8598722DDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs index 9dadc2785..c24728ec9 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBox.cs @@ -48,8 +48,7 @@ namespace Touryo.Infrastructure.CustomControl.RichClient { /// System.Windows.Forms.MaskedTextBoxのカスタム・コントロール - [DefaultProperty("Text")] - [Designer(typeof(WinCustomMaskedTextBoxDesigner))] + [DefaultProperty("Text"), Designer(typeof(WinCustomMaskedTextBoxDesigner))] public class WinCustomMaskedTextBox : MaskedTextBox, ICheck, IGetValue, INotifyPropertyChanged { ///デザイナ上の表示をカスタマイズするインナークラス @@ -167,8 +166,7 @@ public override string Text /// TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに変更。 /// このため、Textプロパティでは必ずマスク適用時の値を取得する。 /// - [Category("動作"), - Description("TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに。")] + [Category("動作"), Description("TextMaskFormatは初期値、IncludeLiteralsのままReadonlyに。")] public new MaskFormat TextMaskFormat { get @@ -179,8 +177,11 @@ public override string Text /// Text2プロパティではマスクを除いた値を取得する。 /// Bindingsで使用可能なようにset_Text2を用意した。 - [Category("表示"), - Description("Text2プロパティではマスクを除いた値を設定・取得する。")] + [Category("表示"), Description("Text2プロパティではマスクを除いた値を設定・取得する。") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Text2 { get @@ -207,8 +208,7 @@ public string Text2 } /// Text3プロパティでは表示時マスク適用時の値を取得する。 - [Category("表示"), - Description("Text3プロパティでは表示時マスク適用時の値を取得する。")] + [Category("表示"), Description("Text3プロパティでは表示時マスク適用時の値を取得する。")] public string Text3 { get @@ -439,20 +439,19 @@ public bool ShouldSerializeEditInitialValue() internal string OriginalMask { get; private set; } /// 入力中のマスク - [Category("Edit"), - Description("入力中のマスク")] + [Category("Edit"), Description("入力中のマスク") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Mask_Editing { get; set; } /// 半角編集 - [DefaultValue(false), - Category("Edit"), - Description("半角指定（マスクで指定できないため）")] + [DefaultValue(false), Category("Edit"), Description("半角指定（マスクで指定できないため）")] public bool EditToHankaku { get; set; } /// 日付編集 - [DefaultValue(false), - Category("Edit"), - Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")] + [DefaultValue(false), Category("Edit"), Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")] public bool EditToYYYYMMDD { get; set; } #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs index 17a2f0a61..fc10098c2 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvCol.cs @@ -47,30 +47,35 @@ public WinCustomMaskedTextBoxDgvCol() : base(new WinCustomMaskedTextBoxDgvCell()) { } /// 初期値編集プロパティに適用する値 - [Category("Edit"), - Description("初期値編集")] + [Category("Edit"), Description("初期値編集") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public EditInitialValue EditInitialValue { get; set; } /// Maskプロパティに適用する値 - [Category("Edit"), - Description("入力後のマスク")] + [Category("Edit"), Description("入力後のマスク") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Mask { set; get; } /// Mask_Editingプロパティに適用する値 - [Category("Edit"), - Description("入力中のマスク")] + [Category("Edit"), Description("入力中のマスク") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Mask_Editing { set; get; } /// 半角指定（マスクで指定できないため） - [DefaultValue(false), - Category("Edit"), - Description("半角指定（マスクで指定できないため）")] + [DefaultValue(false), Category("Edit"), Description("半角指定（マスクで指定できないため）")] public bool EditToHankaku { get; set; } /// YYYYMMDDのM、Dが１桁の時に補正処理を行う。 - [DefaultValue(false), - Category("Edit"), - Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")] + [DefaultValue(false), Category("Edit"), Description("YYYYMMDDのM、Dが１桁の時に補正処理を行う。")] public bool EditToYYYYMMDD { get; set; } /// クローンの作製 diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs index c53f6e5a7..7f246c430 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomMaskedTextBoxDgvHost.cs @@ -32,6 +32,7 @@ using System; using System.Windows.Forms; +using System.ComponentModel; namespace Touryo.Infrastructure.CustomControl.RichClient { @@ -110,6 +111,9 @@ public object GetEditingControlFormattedValue( } /// 編集コントロールで変更されたセルの値 +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public object EditingControlFormattedValue { set @@ -156,12 +160,21 @@ public void ApplyCellStyleToEditingControl( } /// 編集しているセルがあるDataGridView +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public DataGridView EditingControlDataGridView { set; get; } /// 編集しているセルの行があるインデックス +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public int EditingControlRowIndex { set; get; } /// 編集されたか（編集コントロールとセルの値が違うか） +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public bool EditingControlValueChanged { set; get; } /// diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs index 8d13e1c47..95e799cc4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBox.cs @@ -51,8 +51,7 @@ namespace Touryo.Infrastructure.CustomControl.RichClient { /// System.Windows.Forms.TextBoxのカスタム・コントロール - [DefaultProperty("Text")] - [Designer(typeof(WinCustomTextBoxDesigner))] + [DefaultProperty("Text"), Designer(typeof(WinCustomTextBoxDesigner))] public class WinCustomTextBox : TextBox, ICheck, IEdit, IGetValue, INotifyPropertyChanged { ///デザイナ上の表示をカスタマイズするインナークラス @@ -193,8 +192,11 @@ public override string Text } /// Text2プロパティ - [Category("表示"), - Description("ユーザ入力のTextプロパティ")] + [Category("表示"), Description("ユーザ入力のTextプロパティ") +#if NETCOREAPP + ,DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Text2 { get @@ -251,8 +253,11 @@ public string Text2 } /// Text3プロパティ - [Category("表示"), - Description("編集処理込のTextプロパティ")] + [Category("表示"), Description("編集処理込のTextプロパティ") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public string Text3 { get @@ -319,8 +324,11 @@ public string Text3 /// 単位変換に対応したValueプロパティ /// 内部からは触らない値 - [Category("表示"), - Description("単位変換に対応したValueプロパティ")] + [Category("表示"), Description("単位変換に対応したValueプロパティ") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public object Value { get diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs index 370c747e6..626c4b0e4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvCol.cs @@ -47,27 +47,37 @@ public WinCustomTextBoxDgvCol() : base(new WinCustomTextBoxDgvCell()) { } /// MaxLengthプロパティの設定用 +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public int MaxLength { get; set; } /// 入力制限専用プロパティに適用する値 - [DefaultValue(false), - Category("Edit"), - Description("入力制限専用")] + [DefaultValue(false), Category("Edit"), Description("入力制限専用")] public bool IsNumeric { get; set; } /// 初期値編集プロパティに適用する値 - [Category("Edit"), - Description("初期値編集")] + [Category("Edit"), Description("初期値編集") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public EditInitialValue EditInitialValue { get; set; } /// 文字埋め編集プロパティに適用する値 - [Category("Edit"), - Description("文字埋め編集")] + [Category("Edit"), Description("文字埋め編集") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public EditPadding EditPadding { get; set; } /// 小数点以下編集（入力中）プロパティに適用する値 - [Category("Edit"), - Description("小数点以下ｘ桁編集（入力中）")] + [Category("Edit"), Description("小数点以下ｘ桁編集（入力中）") +#if NETCOREAPP + , DesignerSerializationVisibility(DesignerSerializationVisibility.Visible) +#endif + ] public EditDigitsAfterDP EditDigitsAfterDP_Editing { get; set; } /// クローンの作製 diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs index 1f322f964..38bb026e1 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/Control/WinCustomTextBoxDgvHost.cs @@ -31,6 +31,7 @@ //********************************************************************************** using System; +using System.ComponentModel; using System.Windows.Forms; namespace Touryo.Infrastructure.CustomControl.RichClient @@ -116,6 +117,9 @@ public object GetEditingControlFormattedValue( } /// 編集コントロールで変更されたセルの値 +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public object EditingControlFormattedValue { set @@ -174,12 +178,21 @@ public void ApplyCellStyleToEditingControl( } /// 編集しているセルがあるDataGridView +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public DataGridView EditingControlDataGridView { set; get; } /// 編集しているセルの行があるインデックス +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public int EditingControlRowIndex { set; get; } /// 編集されたか（編集コントロールとセルの値が違うか） +#if NETCOREAPP + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] +#endif public bool EditingControlValueChanged { set; get; } /// diff --git a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore100.csproj similarity index 61% rename from root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore100.csproj index 3588dc555..9a3fe817c 100644 --- a/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/CustomControl/RichClient/CustomControl.RichClient_netcore100.csproj @@ -2,7 +2,7 @@ Library - net8.0-windows7.0 + net10.0-windows7.0 true true OpenTouryo.CustomControl.RichClient @@ -11,8 +11,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.CustomControl.RichClient.xml full true 1701;1702;NU1701 @@ -20,8 +20,8 @@ TRACE;NETCOREAPP - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.CustomControl.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.CustomControl.RichClient.xml portable true 1701;1702;NU1701 @@ -33,13 +33,13 @@ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\Build_netcore100\net10.0\OpenTouryo.Public.dll @@ -47,8 +47,4 @@ - - - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/AccessToken.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/AccessToken.cs index b6dc88ad0..de458eba5 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/AccessToken.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/AccessToken.cs @@ -106,12 +106,7 @@ public static bool Verify(string access_token, scopes = JsonConvert.DeserializeObject>(jobj[OAuth2AndOIDCConst.scopes].ToString()); } - long unixTimeSeconds = 0; -#if NET45 - unixTimeSeconds = PubCmnFunction.ToUnixTime(DateTimeOffset.Now); -#else - unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); -#endif + long unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); if (iss == CmnClientParams.Isser && long.Parse(exp) >= unixTimeSeconds) diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnClientParams.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnClientParams.cs index 6e57a8c47..42d794263 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnClientParams.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnClientParams.cs @@ -141,8 +141,6 @@ public static string RsaPfxFilePath } } -#if NET45 || NET46 -#else /// EcdsaPfxPassword public static string EcdsaPfxPassword { @@ -160,7 +158,7 @@ public static string EcdsaPfxFilePath return GetConfigParameter.GetConfigValue("SpRp_EcdsaPfxFilePath"); } } -#endif + #endregion #region クライアント証明書 diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnJwtToken.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnJwtToken.cs index 1a3336a70..37d50bf47 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnJwtToken.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/CmnJwtToken.cs @@ -115,11 +115,7 @@ public static bool Verify(string jwtToken, out string jwtPayload) // 旧バージョン（証明書を使用 if (isJWE_FAPI2) { -#if NET45 || NET46 - throw new NotSupportedException("FAPI2 is not supported in this dotnet version."); -#else jws = new JWS_ES256_X509(CmnClientParams.EcdsaCerFilePath, ""); -#endif } else { @@ -151,11 +147,7 @@ public static bool Verify(string jwtToken, out string jwtPayload) // 証明書を使用 if (isJWE_FAPI2) { -#if NET45 || NET46 - throw new NotSupportedException("FAPI2 is not supported in this dotnet version."); -#else jws = new JWS_ES256_X509(CmnClientParams.EcdsaCerFilePath, ""); -#endif } else { @@ -167,12 +159,8 @@ public static bool Verify(string jwtToken, out string jwtPayload) // Jwkを使用 if (isJWE_FAPI2) { -#if NET45 || NET46 - throw new NotSupportedException("FAPI2 is not supported in this dotnet version."); -#else EccPublicKeyConverter epkc = new EccPublicKeyConverter(); jws = new JWS_ES256_Param(epkc.JwkToParam(jwkObject), false); -#endif } else { @@ -198,11 +186,7 @@ public static bool Verify(string jwtToken, out string jwtPayload) // 証明書を使用 if (isJWE_FAPI2) { -#if NET45 || NET46 - throw new NotSupportedException("FAPI2 is not supported in this dotnet version."); -#else jws = new JWS_ES256_X509(CmnClientParams.EcdsaCerFilePath, ""); -#endif } else { @@ -214,12 +198,8 @@ public static bool Verify(string jwtToken, out string jwtPayload) // Jwkを使用 if (isJWE_FAPI2) { -#if NET45 || NET46 - throw new NotSupportedException("FAPI2 is not supported in this dotnet version."); -#else EccPublicKeyConverter epkc = new EccPublicKeyConverter(); jws = new JWS_ES256_Param(epkc.JwkToParam(jwkObject), false); -#endif } else { @@ -260,11 +240,7 @@ public static string CreateJitClaim() /// public static string CreateIatClaim() { -#if NET45 - return PubCmnFunction.ToUnixTime(DateTimeOffset.Now).ToString(); -#else return DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); -#endif } /// @@ -276,11 +252,7 @@ public static string CreateIatClaim() /// public static string CreateExpClaim(TimeSpan forExp) { -#if NET45 - return PubCmnFunction.ToUnixTime(DateTimeOffset.Now.Add(forExp)).ToString(); -#else return DateTimeOffset.Now.Add(forExp).ToUnixTimeSeconds().ToString(); -#endif } /// CheckClaims @@ -325,11 +297,7 @@ public static bool CheckClaims( /// bool public static bool VerifyExp(string exp) { -#if NET45 - return (long.Parse(exp) >= PubCmnFunction.ToUnixTime(DateTimeOffset.Now)); -#else return (long.Parse(exp) >= DateTimeOffset.Now.ToUnixTimeSeconds()); -#endif } /// VerifyNbf @@ -337,11 +305,7 @@ public static bool VerifyExp(string exp) /// bool public static bool VerifyNbf(string nbf) { -#if NET45 - return (long.Parse(nbf) <= PubCmnFunction.ToUnixTime(DateTimeOffset.Now)); -#else return (long.Parse(nbf) <= DateTimeOffset.Now.ToUnixTimeSeconds()); -#endif } #endregion } diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/IdToken.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/IdToken.cs index ab18c24cf..be8e9092b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/IdToken.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/IdToken.cs @@ -153,13 +153,7 @@ public static bool Verify(string id_token, #endregion - long unixTimeSeconds = 0; - -#if NET45 - unixTimeSeconds = PubCmnFunction.ToUnixTime(DateTimeOffset.Now); -#else - unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); -#endif + long unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); if (iss == CmnClientParams.Isser && long.Parse(exp) >= unixTimeSeconds) @@ -222,7 +216,7 @@ public static string CreateHash(string input) // input(access_token や code) のASCII オクテット列からハッシュ値を求め、 byte[] bytes = GetHash.GetHashBytes( CustomEncode.StringToByte(input, CustomEncode.us_ascii), - EnumHashAlgorithm.SHA256_M); + EnumHashAlgorithm.SHA256); // 左半分を base64url エンコードした値。 return CustomEncode.ToBase64UrlString( diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwtAssertion.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwtAssertion.cs index 61528017d..006567c23 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwtAssertion.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/JwtAssertion.cs @@ -75,15 +75,12 @@ public static string Create( return JwtAssertion.CreateByRsa(iss, aud, forExp, scopes, rpkc.JwkToParam(jwkPrivateKey)); } -#if NET45 || NET46 -#else else if (((string)temp["kty"]).ToUpper() == "EC") { EccPrivateKeyConverter epkc = new EccPrivateKeyConverter(JWS_ECDSA.ES._256); return JwtAssertion.CreateByECDsa(iss, aud, forExp, scopes, epkc.JwkToParam(jwkPrivateKey)); } -#endif } return ""; @@ -127,8 +124,6 @@ public static string CreateByRsa( #endregion } -#if NET45 || NET46 -#else /// CreateByECDsa /// client_id /// Token2 EndPointのuri @@ -208,7 +203,6 @@ public static string CreateByECDsa( #endregion } -#endif #endregion #region Verify @@ -238,8 +232,6 @@ public static bool Verify(string jwtAssertion, out iss, out aud, out scopes, out jobj, rpkc.JwkToParam(jwkPublicKey)); } -#if NET45 || NET46 -#else else if (((string)temp["kty"]).ToUpper() == "EC") { EccPublicKeyConverter epkc = new EccPublicKeyConverter(); @@ -247,7 +239,6 @@ public static bool Verify(string jwtAssertion, out iss, out aud, out scopes, out jobj, epkc.JwkToParam(jwkPublicKey)); } -#endif } return false; @@ -283,12 +274,8 @@ public static bool VerifyByRsa(string jwtAssertion, //string iat = (string)jobj[OAuth2AndOIDCConst.iat]; scopes = (string)jobj[OAuth2AndOIDCConst.scope]; - long unixTimeSeconds = 0; -#if NET45 - unixTimeSeconds = PubCmnFunction.ToUnixTime(DateTimeOffset.Now); -#else - unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); -#endif + long unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); + string exp = (string)jobj[OAuth2AndOIDCConst.exp]; if (long.Parse(exp) >= unixTimeSeconds) { @@ -308,8 +295,6 @@ public static bool VerifyByRsa(string jwtAssertion, return false; } -#if NET45 || NET46 -#else /// VerifyByECDsa /// string /// client_id @@ -340,12 +325,7 @@ public static bool VerifyByECDsa(string jwtAssertion, //string iat = (string)jobj[OAuth2AndOIDCConst.iat]; scopes = (string)jobj[OAuth2AndOIDCConst.scope]; - long unixTimeSeconds = 0; -#if NET45 - unixTimeSeconds = PubCmnFunction.ToUnixTime(DateTimeOffset.Now); -#else - unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); -#endif + long unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); string exp = (string)jobj[OAuth2AndOIDCConst.exp]; if (long.Parse(exp) >= unixTimeSeconds) { @@ -364,7 +344,6 @@ public static bool VerifyByECDsa(string jwtAssertion, // 認証に失敗 return false; } -#endif #endregion } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/OAuth2AndOIDCClient.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/OAuth2AndOIDCClient.cs index 12704f617..ce7dc074a 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/OAuth2AndOIDCClient.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/OAuth2AndOIDCClient.cs @@ -405,7 +405,7 @@ public static async Task GetUserInfoAsync(Uri userInfoEndpointUri, strin public static string PKCE_S256_CodeChallengeMethod(string code_verifier) { return CustomEncode.ToBase64UrlString(GetHash.GetHashBytes(CustomEncode.StringToByte( - code_verifier, CustomEncode.us_ascii), EnumHashAlgorithm.SHA256_M)); + code_verifier, CustomEncode.us_ascii), EnumHashAlgorithm.SHA256)); } #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/RequestObject.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/RequestObject.cs index 996b97f73..01c745fb5 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/RequestObject.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/RequestObject.cs @@ -236,8 +236,6 @@ public static bool Verify(string ro, out string iss, RSAParameters rsaPublicKey) #endregion -#if NET45 || NET46 -#else #region FAPI CIBA // - OpenID Connect Client Initiated Backchannel Authentication Flow - Core 1.0 draft-01 @@ -419,6 +417,5 @@ public static bool VerifyCiba(string ro, out string iss, ECParameters ecPublicKe #endregion #endregion -#endif } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/ResponseObject.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/ResponseObject.cs index 4fd2e5963..01f8cfd4e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/ResponseObject.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/ResponseObject.cs @@ -82,12 +82,7 @@ public static bool Verify(string response, out JObject jobj) //string iat = (string)jobj[OAuth2AndOIDCConst.iat]; string exp = (string)jobj[OAuth2AndOIDCConst.exp]; - long unixTimeSeconds = 0; -#if NET45 - unixTimeSeconds = PubCmnFunction.ToUnixTime(DateTimeOffset.Now); -#else - unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); -#endif + long unixTimeSeconds = DateTimeOffset.Now.ToUnixTimeSeconds(); if (iss == CmnClientParams.Isser && long.Parse(exp) >= unixTimeSeconds) diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/SAML2Client.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/SAML2Client.cs index 90cc7fb46..f3b726f49 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/SAML2Client.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Authentication/SAML2Client.cs @@ -61,14 +61,7 @@ public static string CreateRedirectRequest( string iss, string assertionConsumerService, string relayState, out string id) { // DigitalSignX509 - DigitalSignX509 dsX509 = new DigitalSignX509( - CmnClientParams.RsaPfxFilePath, CmnClientParams.RsaPfxPassword, -#if NET45 - HashNameConst.SHA1 -#else - HashAlgorithmName.SHA1 -#endif - ); + DigitalSignX509 dsX509 = new DigitalSignX509(CmnClientParams.RsaPfxFilePath, CmnClientParams.RsaPfxPassword, HashAlgorithmName.SHA1); // SamlRequestの生成 @@ -95,8 +88,11 @@ public static string CreatePostRequest( string iss, string assertionConsumerService, string relayState, out string id) { // RSA - X509Certificate2 x509 = new X509Certificate2( - CmnClientParams.RsaPfxFilePath, CmnClientParams.RsaPfxPassword); +#if NETSTD + X509Certificate2 x509 = X509CertificateLoader.LoadPkcs12FromFile(CmnClientParams.RsaPfxFilePath, CmnClientParams.RsaPfxPassword); +#else + X509Certificate2 x509 = new X509Certificate2(CmnClientParams.RsaPfxFilePath, CmnClientParams.RsaPfxPassword); +#endif // SamlRequestの生成 string samlRequest = SAML2Bindings.CreateRequest( @@ -104,12 +100,7 @@ public static string CreatePostRequest( assertionConsumerService, out id).OuterXml; // SamlRequestのエンコと署名 - return SAML2Bindings.EncodeAndSignPost(samlRequest, id, -#if NET45 - (RSA)x509.PrivateKey); -#else - x509.GetRSAPrivateKey()); -# endif + return SAML2Bindings.EncodeAndSignPost(samlRequest, id, x509.GetRSAPrivateKey()); } #endregion @@ -186,14 +177,7 @@ public static bool VerifyResponse( #region 検証 // Metadata利用を検討 - DigitalSignX509 dsX509 = new DigitalSignX509( - CmnClientParams.RsaCerFilePath, "", -#if NET45 - HashNameConst.SHA1 -#else - HashAlgorithmName.SHA1 -#endif - ); + DigitalSignX509 dsX509 = new DigitalSignX509(CmnClientParams.RsaCerFilePath, "", HashAlgorithmName.SHA1); if (!string.IsNullOrEmpty(queryString)) { @@ -209,12 +193,7 @@ public static bool VerifyResponse( { // VerifyPost string id = SAML2Bindings.GetIdInResponse(samlResponse2, samlNsMgr); - if (SAML2Bindings.VerifyPost(decodeSaml, id, -#if NET45 - (RSA)dsX509.PublicKey)) -#else - dsX509.X509Certificate.GetRSAPublicKey())) -#endif + if (SAML2Bindings.VerifyPost(decodeSaml, id, dsX509.X509Certificate.GetRSAPublicKey())) { // XPathによる検証 verified = SAML2Bindings.VerifyByXPath( diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore100.csproj similarity index 73% rename from root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore100.csproj index 95b73674b..97834fbad 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Framework_netcore100.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 Touryo.Infrastructure.Framework OpenTouryo.Framework 3.0.0.0 @@ -9,19 +9,19 @@ - TRACE;DEBUG; - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Framework.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Framework.xml full true + $(DefineConstants);NETSTD - TRACE;NETSTD - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Framework.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Framework.xml portable true + $(DefineConstants);NETSTD @@ -51,8 +51,6 @@ - - @@ -60,8 +58,8 @@ - - + + diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore100.csproj similarity index 65% rename from root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore100.csproj index dcefa514b..727448c34 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/RichClient/Framework.RichClient_netcore100.csproj @@ -2,7 +2,7 @@ Library - net8.0-windows7.0 + net10.0-windows7.0 true true @@ -13,16 +13,16 @@ - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.xml full true TRACE;NETCOREAPP - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.xml portable true TRACE;NETCOREAPP @@ -37,8 +37,8 @@ - - + + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs b/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs index d130c7ada..3906260b1 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Framework/Transmission/CallController.cs @@ -1248,7 +1248,11 @@ private X509Certificate2 CreateX509Certificate(Dictionary props) // XML定義：キーが無い // クライアント証明書のファイルパス - x509 = new X509Certificate2(props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE]); +#if NETSTD + x509 = X509CertificateLoader.LoadCertificateFromFile(props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE]); +#else + x509 = new X509Certificate2(props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE]); +#endif } else { @@ -1257,16 +1261,26 @@ private X509Certificate2 CreateX509Certificate(Dictionary props) // XML定義：null or 空文字列 // クライアント証明書のファイルパス +#if NETSTD + x509 = X509CertificateLoader.LoadCertificateFromFile(props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE]); +#else x509 = new X509Certificate2(props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE]); +#endif } else { // XML定義：あり // クライアント証明書のファイルパス ＋ クライアント証明書ＤＢのパスワード +#if NETSTD + x509 = X509CertificateLoader.LoadPkcs12FromFile( + props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE], + props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_PASSWORD]); +#else x509 = new X509Certificate2( props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_FILE], props[FxLiteral.TRANSMISSION_HTTP_PROP_X509CERTIFICATE_PASSWORD]); +#endif } } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net48.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net48.sln index 8bb7d5bba..017f29ecf 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net48.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_net48.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.RichClient", "Framework\RichClient\Framework.RichClient_net48.csproj", "{3468B633-2CFE-4A1E-870F-396961E49A9E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework.RichClient_net48", "Framework\RichClient\Framework.RichClient_net48.csproj", "{3468B633-2CFE-4A1E-870F-396961E49A9E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore80.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore100.sln similarity index 82% rename from root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore80.sln rename to root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore100.sln index ac5ec03ea..5b48a08e1 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore80.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_RichClient_netcore100.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11012.119 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework.RichClient_netcore80", "Framework\RichClient\Framework.RichClient_netcore80.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework.RichClient_netcore100", "Framework\RichClient\Framework.RichClient_netcore100.csproj", "{7518B624-536C-4F4B-8E73-E5421EDCF1DD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Public_netcore80", "Public\Public_netcore80.csproj", "{B7B97B7C-B8A2-44CC-AB00-107D634A45E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Public_netcore100", "Public\Public_netcore100.csproj", "{B7B97B7C-B8A2-44CC-AB00-107D634A45E7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework_netcore80", "Framework\Framework_netcore80.csproj", "{D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Framework_netcore100", "Framework\Framework_netcore100.csproj", "{D5A5BE98-2C29-48BE-95B3-0E6A8F500E14}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_net48.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_net48.sln index 87acb4a6d..9ae119495 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_net48.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_net48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Public_net48", "Public\Public_net48.csproj", "{81CC573A-0DF9-49E5-AF10-A50F9B194DA5}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/Nuget_netcore80.sln b/root/programs/CS/Frameworks/Infrastructure/Nuget_netcore100.sln similarity index 81% rename from root/programs/CS/Frameworks/Infrastructure/Nuget_netcore80.sln rename to root/programs/CS/Frameworks/Infrastructure/Nuget_netcore100.sln index 88ed4df08..914e6bb8b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Nuget_netcore80.sln +++ b/root/programs/CS/Frameworks/Infrastructure/Nuget_netcore100.sln @@ -1,19 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11012.119 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Public_netcore80", "Public\Public_netcore80.csproj", "{603EB991-F629-4207-A45C-A7979F0B27F8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Public_netcore100", "Public\Public_netcore100.csproj", "{603EB991-F629-4207-A45C-A7979F0B27F8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Public.Security_netcore80", "Public\Security\Public.Security_netcore80.csproj", "{140D7AC4-1E52-0E0F-10EB-0E2087E39DCC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Public.Security_netcore100", "Public\Security\Public.Security_netcore100.csproj", "{140D7AC4-1E52-0E0F-10EB-0E2087E39DCC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework_netcore80", "Framework\Framework_netcore80.csproj", "{FA092A28-3954-D33E-69C3-EDFD83BECB3D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Framework_netcore100", "Framework\Framework_netcore100.csproj", "{FA092A28-3954-D33E-69C3-EDFD83BECB3D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamManagedOdp_netcore80", "Public\Db\DamManagedOdp\DamManagedOdp_netcore80.csproj", "{91F656A8-2AC1-291F-38C1-E4D63B55A2E7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamManagedOdp_netcore100", "Public\Db\DamManagedOdp\DamManagedOdp_netcore100.csproj", "{91F656A8-2AC1-291F-38C1-E4D63B55A2E7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamMySQL_netcore80", "Public\Db\DamMySQL\DamMySQL_netcore80.csproj", "{C8D6A524-2855-3573-005C-7C1BC95A758E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamMySQL_netcore100", "Public\Db\DamMySQL\DamMySQL_netcore100.csproj", "{C8D6A524-2855-3573-005C-7C1BC95A758E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamPstGrS_netcore80", "Public\Db\DamPstGrS\DamPstGrS_netcore80.csproj", "{00EB689D-08F5-6996-C459-F81B654229AF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DamPstGrS_netcore100", "Public\Db\DamPstGrS\DamPstGrS_netcore100.csproj", "{00EB689D-08F5-6996-C459-F81B654229AF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/BaseDam.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Db/BaseDam.cs index 0b233d510..c3b8b2f7e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/BaseDam.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/BaseDam.cs @@ -2739,8 +2739,10 @@ private void StringToParameter(string paramString, DataTable dt) //Int32と同じサイズのバイト配列にランダムな値を設定する //byte[] bs = new byte[sizeof(int)]; byte[] bs = new byte[4]; - RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider(); - rng.GetBytes(bs); + + //RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider(); + //rng.GetBytes(bs); + RandomNumberGenerator.Create().GetBytes(bs); //Int32に変換する if (BitConverter.ToInt32(bs, 0) % 2 == 0) diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore100.csproj similarity index 71% rename from root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore100.csproj index 16c4e202b..0b0636512 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamManagedOdp/DamManagedOdp_netcore100.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 OpenTouryo.DamManagedOdp Touryo.Infrastructure.Public.Db 3.0.0.0 @@ -9,16 +9,16 @@ TRACE;DEBUG;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.xml full true TRACE;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.xml portable true @@ -36,6 +36,6 @@ - + \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore100.csproj similarity index 71% rename from root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore100.csproj index be58442b5..30379dd39 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamMySQL/DamMySQL_netcore100.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 OpenTouryo.DamMySQL Touryo.Infrastructure.Public.Db 3.0.0.0 @@ -9,16 +9,16 @@ TRACE;DEBUG;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.xml full true TRACE;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamMySQL.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamMySQL.xml portable true @@ -33,7 +33,7 @@ - + diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore100.csproj similarity index 71% rename from root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore100.csproj index d571c7d62..fbb9b1028 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Db/DamPstGrS/DamPstGrS_netcore100.csproj @@ -1,6 +1,6 @@  - net8.0 + net10.0 OpenTouryo.DamPstGrS Touryo.Infrastructure.Public.Db 3.0.0.0 @@ -9,16 +9,16 @@ TRACE;DEBUG;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.xml full true TRACE;NETSTD - ..\..\..\Build_netcore80\ - ..\..\..\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.xml + ..\..\..\Build_netcore100\ + ..\..\..\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.xml portable true @@ -33,7 +33,7 @@ - + diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Diagnostics/MyDebug.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Diagnostics/MyDebug.cs index 62fdf40f9..8839c69ec 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Diagnostics/MyDebug.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Diagnostics/MyDebug.cs @@ -34,186 +34,12 @@ using System; using System.Diagnostics; -using System.Security.Cryptography.X509Certificates; - -using Touryo.Infrastructure.Public.Str; namespace Touryo.Infrastructure.Public.Diagnostics { /// MyDebugクラス public class MyDebug { - #region Security - - #region JWT - - /// InspectJwt - /// string - /// string - public static void InspectJwt(string testLabel, string jwt) - { - string[] aryStr = jwt.Split('.'); - - if (aryStr.Length == 3) - { - MyDebug.InspectJws(testLabel, aryStr); - } - else if (aryStr.Length == 5) - { - MyDebug.InspectJwe(testLabel, aryStr); - } - else { } - } - - #region JWS - - /// InspectJws - /// string - /// string[] - public static void InspectJws(string testLabel, string[] jws) - { - MyDebug.OutputDebugAndConsole(testLabel, "JWS Header: " + - CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jws[0]), CustomEncode.UTF_8)); - - MyDebug.OutputDebugAndConsole(testLabel, "JWS Payload: " + - CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jws[1]), CustomEncode.UTF_8)); - - MyDebug.OutputDebugAndConsole(testLabel, "JWS Signature: " + jws[2]); - } - - #endregion - - #region JWE - - /// InspectJwe - /// string - /// string[] - public static void InspectJwe(string testLabel, string[] jwe) - { - MyDebug.OutputDebugAndConsole(testLabel, "JWE Header: " + - CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jwe[0]), CustomEncode.UTF_8)); - - MyDebug.OutputDebugAndConsole(testLabel, "JWE Encrypted Key: " + jwe[1]); - MyDebug.OutputDebugAndConsole(testLabel, "JWE Initialization Vector: " + jwe[2]); - MyDebug.OutputDebugAndConsole(testLabel, "JWE Ciphertext: " + jwe[3]); - MyDebug.OutputDebugAndConsole(testLabel, "JWE Authentication Tag: " + jwe[4]); - } - - #endregion - - #endregion - - #region X.509 - - /// InspectPrivateX509Key - /// string - /// X509Certificate2 - public static void InspectPrivateX509Key(string testLabel, X509Certificate2 privateX509Key) - { - // X509Certificate2.PrivateKey - MyDebug.OutputDebugAndConsole( - testLabel, "X509Certificate2.PrivateKey: " - + (privateX509Key == null ? "is null" : "is not null")); - - if (privateX509Key == null) - { - return; - } - - // SignatureAlgorithm.FriendlyName - try - { - MyDebug.OutputDebugAndConsole( - testLabel, "SignatureAlgorithm.FriendlyName: " - + privateX509Key.SignatureAlgorithm.FriendlyName); - } - catch (Exception ex) - { - MyDebug.OutputDebugAndConsole( - testLabel, "SignatureAlgorithm.FriendlyName: " - + ex.GetType().ToString() + ", " + ex.Message); - } - - // PrivateKey.ToString() - try - { - if (privateX509Key.HasPrivateKey) - { - MyDebug.OutputDebugAndConsole( - testLabel, "PrivateKey.ToString(): " - + (privateX509Key.PrivateKey == null ? "is null" : "is " - + privateX509Key.PrivateKey.ToString())); - } - } - catch (Exception ex) - { - MyDebug.OutputDebugAndConsole( - testLabel, "PrivateKey.ToString(): " - + ex.GetType().ToString() + ", " + ex.Message); - } - } - - /// InspectPublicX509Key - /// string - /// X509Certificate2 - public static void InspectPublicX509Key(string testLabel, X509Certificate2 publicX509Key) - { - // X509Certificate2.PublicKey - MyDebug.OutputDebugAndConsole( - testLabel, "publicX509Key: " - + (publicX509Key == null ? "is null" : "is not null")); - if (publicX509Key == null) - { - return; - } - - // SignatureAlgorithm.FriendlyName - try - { - MyDebug.OutputDebugAndConsole( - testLabel, "SignatureAlgorithm.FriendlyName: " - + publicX509Key.SignatureAlgorithm.FriendlyName); - } - catch (Exception ex) - { - MyDebug.OutputDebugAndConsole( - testLabel, "SignatureAlgorithm.FriendlyName: " - + ex.GetType().ToString() + ", " + ex.Message); - } - - // PublicKey.ToString() - if (publicX509Key.PublicKey != null) - { - MyDebug.OutputDebugAndConsole( - testLabel, "PublicKey.ToString(): " - + (publicX509Key.PublicKey == null ? "is null" : "is " - + publicX509Key.PublicKey.ToString())); - - // PublicKey.Key.ToString() - try - { - if (publicX509Key.PublicKey.Key != null) - { - MyDebug.OutputDebugAndConsole( - testLabel, "PublicKey.Key.ToString(): " - + (publicX509Key.PublicKey.Key == null ? "is null" : "is " - + publicX509Key.PublicKey.Key.ToString())); - } - } - catch (Exception ex) - { - MyDebug.OutputDebugAndConsole( - testLabel, "PublicKey.Key.ToString(): " - + ex.GetType().ToString() + ", " + ex.Message); - } - } - } - - #endregion - - #endregion - - #region OutputDebugAndConsole /// OutputDebugAndConsole /// string /// string @@ -235,6 +61,5 @@ public static void OutputDebugAndConsole(string s) if (MyDebug.CanOutputToConsole) Console.WriteLine(s); if (MyDebug.CanOutputToDebug) Debug.WriteLine(s); } - #endregion } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Public_net48.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Public_net48.csproj index 65e9570ae..63619373c 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Public_net48.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Public_net48.csproj @@ -97,9 +97,6 @@ - - - @@ -171,9 +168,6 @@ - - 1.16.0 - 3.1.0 diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore100.csproj similarity index 87% rename from root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore100.csproj index 57ae6897d..553e1cc41 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Public_netcore100.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 OpenTouryo.Public Touryo.Infrastructure.Public 3.0.0.0 @@ -10,16 +10,16 @@ $(DefineConstants);NETCOREAPP - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Public.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Public.xml full true TRACE;NETCOREAPP - ..\Build_netcore80\ - ..\Build_netcore80\net8.0\OpenTouryo.Public.xml + ..\Build_netcore100\ + ..\Build_netcore100\net10.0\OpenTouryo.Public.xml portable true @@ -64,6 +64,9 @@ + + + @@ -86,7 +89,6 @@ - @@ -96,8 +98,6 @@ - - diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/ASymmetricCryptography.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/ASymmetricCryptography.cs index 4aa288c6d..4f5296137 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/ASymmetricCryptography.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/ASymmetricCryptography.cs @@ -116,52 +116,7 @@ public ASymmetricCryptography( #endregion #region Encrypt(publicXmlKey) -#if NET45 - /// 文字列を暗号化する - /// 暗号化する文字列 - /// 暗号化に使用する公開鍵 - /// - /// ・true : OAEPパディング（XP以降） - /// ・false : PKCS#1 v1.5パディング - /// - /// 非対称アルゴリズムで暗号化された文字列 - public string EncryptString(string sourceString, string publicXmlKey = "", bool fOAEP = false) - { - // 元文字列をbyte型配列に変換する（UTF-8 Enc） - byte[] source = CustomEncode.StringToByte(sourceString, CustomEncode.UTF_8); - - // 暗号化（Base64） - return CustomEncode.ToBase64String( - this.EncryptBytes(source, publicXmlKey, fOAEP)); - } - - /// バイト配列を暗号化する - /// 暗号化するバイト配列 - /// 暗号化に使用する公開鍵 - /// - /// ・true : OAEPパディング（XP以降） - /// ・false : PKCS#1 v1.5パディング - /// - /// 非対称アルゴリズムで暗号化されたバイト配列 - public byte[] EncryptBytes(byte[] source, string publicXmlKey = "", bool fOAEP = false) - { - // NET45はCSPのみ。 - RSACryptoServiceProvider rsa = (RSACryptoServiceProvider)this._asa; - // 公開鍵 - if (string.IsNullOrEmpty(publicXmlKey)) - { - //rsa.FromXmlString(this.PublicXmlKey); - } - else - { - rsa.FromXmlString(publicXmlKey); - } - - // 暗号化 - return rsa.Encrypt(source, fOAEP); - } -#else /// 文字列を暗号化する /// 暗号化する文字列 /// 暗号化に使用する公開鍵 @@ -204,58 +159,11 @@ public byte[] EncryptBytes(byte[] source, string publicXmlKey = "", RSAEncryptio return rsa.Encrypt(source, padding); } -#endif #endregion #region Decrypt(privateXmlKey) -#if NET45 - /// 暗号化された文字列を復号化する - /// 暗号化された文字列 - /// 復号化に使用する秘密鍵 - /// - /// ・true : OAEPパディング（XP以降） - /// ・false : PKCS#1 v1.5パディング - /// - /// 非対称アルゴリズムで復号化された文字列 - public string DecryptString(string sourceString, string privateXmlKey = "", bool fOAEP = false) - { - // 暗号化文字列をbyte型配列に変換する（Base64） - byte[] source = CustomEncode.FromBase64String(sourceString); - - // 復号化（UTF-8 Enc） - return CustomEncode.ByteToString( - this.DecryptBytes(source, privateXmlKey, fOAEP), CustomEncode.UTF_8); - } - - /// 暗号化されたバイト配列を復号化する - /// 暗号化されたバイト配列 - /// 復号化に使用する秘密鍵 - /// - /// ・true : OAEPパディング（XP以降） - /// ・false : PKCS#1 v1.5パディング - /// - /// 非対称アルゴリズムで復号化されたバイト配列 - public byte[] DecryptBytes(byte[] source, string privateXmlKey = "", bool fOAEP = false) - { - // NET45はCSPのみ。 - RSACryptoServiceProvider rsa = (RSACryptoServiceProvider)this._asa; - - // 秘密鍵 - if (string.IsNullOrEmpty(privateXmlKey)) - { - //rsa.FromXmlString(this.PrivateXmlKey); - } - else - { - rsa.FromXmlString(privateXmlKey); - } - - // 復号化 - return rsa.Decrypt(source, fOAEP); - } -#else /// 暗号化された文字列を復号化する /// 暗号化された文字列 /// 復号化に使用する秘密鍵 @@ -298,7 +206,6 @@ public byte[] DecryptBytes(byte[] source, string privateXmlKey = "", RSAEncrypti return rsa.Decrypt(source, padding); } -#endif #endregion } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/AsymmetricAlgorithmCmnFunc.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/AsymmetricAlgorithmCmnFunc.cs index 8ca648c6e..1abbc0f20 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/AsymmetricAlgorithmCmnFunc.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/AsymmetricAlgorithmCmnFunc.cs @@ -50,6 +50,69 @@ namespace Touryo.Infrastructure.Public.Security /// public class AsymmetricAlgorithmCmnFunc { + #region GetKey + + /// GetPublicKey + /// X509Certificate2 + /// PublicKey + /// + public static AsymmetricAlgorithm GetPublicKey(X509Certificate2 x509Key) + { + switch (x509Key.PublicKey.Oid.FriendlyName.ToUpper()) + { + case "RSA": + return x509Key.GetRSAPublicKey(); + + case "DSA": + return x509Key.GetDSAPublicKey(); + + case "ECC": + case "ECDSA": + return x509Key.GetECDsaPublicKey(); +#if NETSTD + case "ECDH": + return x509Key.GetECDiffieHellmanPublicKey(); +#endif + default: + return null; + } + } + + /// GetPrivateKey + /// X509Certificate2 + /// PrivateKey + /// + public static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 x509Key) + { + if (x509Key.HasPrivateKey) + { + switch (x509Key.PublicKey.Oid.FriendlyName.ToUpper()) + { + case "RSA": + return x509Key.GetRSAPrivateKey(); + + case "DSA": + return x509Key.GetDSAPrivateKey(); + + case "ECC": + case "ECDSA": + return x509Key.GetECDsaPrivateKey(); +#if NETSTD + case "ECDH": + return x509Key.GetECDiffieHellmanPrivateKey(); +#endif + default: + return null; + } + } + else + { + return null; + } + } + +#endregion + #region Simple factories /// RsaFactory /// RSA @@ -96,16 +159,31 @@ public static AsymmetricAlgorithm CreateCryptographySP( if (easa == EnumASymmetricAlgorithm.X509) { // X.509対応 +#if NETSTD + X509Certificate2 x509Key = null; + + if (string.IsNullOrEmpty(password)) + { + x509Key = X509CertificateLoader.LoadCertificateFromFile(certificateFilePath); + } + else + { + x509Key = X509CertificateLoader.LoadPkcs12FromFile(certificateFilePath, password, flag); + } +#else X509Certificate2 x509Key = new X509Certificate2(certificateFilePath, password, flag); +#endif if (string.IsNullOrEmpty(password)) { - asa = x509Key.PublicKey.Key; + //asa = x509Key.PublicKey.Key; + asa = AsymmetricAlgorithmCmnFunc.GetPublicKey(x509Key); } else { - asa = x509Key.PrivateKey; - } + //asa = x509Key.PrivateKey; + asa = AsymmetricAlgorithmCmnFunc.GetPrivateKey(x509Key); + } } else { @@ -114,14 +192,11 @@ public static AsymmetricAlgorithm CreateCryptographySP( // RSACryptoServiceProviderサービスプロバイダ asa = RSACryptoServiceProvider.Create(); // devps(1703) } - -#if !NET45 else if (easa == EnumASymmetricAlgorithm.RsaCng) { // RSACngサービスプロバイダ asa = RSACng.Create(); // devps(1703) } -#endif #if NETSTD else if (easa == EnumASymmetricAlgorithm.RsaOpenSsl) { @@ -149,39 +224,41 @@ public static AsymmetricAlgorithm CreateCryptographySP( public static void CreateDigitalSignSP( EnumDigitalSignAlgorithm eaa, out AsymmetricAlgorithm aa, out HashAlgorithm ha) { +#pragma warning disable CA1416 // アルゴリズム名で暗喩的に振り分けるため。 aa = null; ha = null; // 公開鍵・暗号化サービスプロバイダ - if (eaa == EnumDigitalSignAlgorithm.RsaCSP_MD5 - || eaa == EnumDigitalSignAlgorithm.RsaCSP_SHA1 - || eaa == EnumDigitalSignAlgorithm.RsaCSP_SHA256 - || eaa == EnumDigitalSignAlgorithm.RsaCSP_SHA384 - || eaa == EnumDigitalSignAlgorithm.RsaCSP_SHA512) + if (eaa == EnumDigitalSignAlgorithm.Rsa_MD5 + || eaa == EnumDigitalSignAlgorithm.Rsa_SHA1 + || eaa == EnumDigitalSignAlgorithm.Rsa_SHA256 + || eaa == EnumDigitalSignAlgorithm.Rsa_SHA384 + || eaa == EnumDigitalSignAlgorithm.Rsa_SHA512) { // RSACryptoServiceProviderサービスプロバイダ aa = new RSACryptoServiceProvider(); switch (eaa) { - case EnumDigitalSignAlgorithm.RsaCSP_MD5: + case EnumDigitalSignAlgorithm.Rsa_MD5: ha = MD5.Create(); break; - case EnumDigitalSignAlgorithm.RsaCSP_SHA1: + case EnumDigitalSignAlgorithm.Rsa_SHA1: ha = SHA1.Create(); break; - case EnumDigitalSignAlgorithm.RsaCSP_SHA256: + case EnumDigitalSignAlgorithm.Rsa_SHA256: ha = SHA256.Create(); break; - case EnumDigitalSignAlgorithm.RsaCSP_SHA384: + case EnumDigitalSignAlgorithm.Rsa_SHA384: ha = SHA384.Create(); break; - case EnumDigitalSignAlgorithm.RsaCSP_SHA512: + case EnumDigitalSignAlgorithm.Rsa_SHA512: ha = SHA512.Create(); break; } } #if NETSTD + /* else if (eaa == EnumDigitalSignAlgorithm.RsaOpenSsl_MD5 || eaa == EnumDigitalSignAlgorithm.RsaOpenSsl_SHA1 || eaa == EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256 @@ -210,6 +287,7 @@ public static void CreateDigitalSignSP( break; } } + */ #endif else if (eaa == EnumDigitalSignAlgorithm.DsaCSP_SHA1) { @@ -217,11 +295,13 @@ public static void CreateDigitalSignSP( aa = new DSACryptoServiceProvider(); ha = SHA1.Create(); } + #if NETSTD - else if (eaa == EnumDigitalSignAlgorithm.DsaOpenSsl_SHA1) + else if (eaa == EnumDigitalSignAlgorithm.DsaOpenSsl_SHA256)//DsaOpenSsl_SHA1) { // DSAOpenSslサービスプロバイダ aa = new DSAOpenSsl(); + ha = SHA1.Create(); } #endif @@ -274,7 +354,7 @@ public static void CreateDigitalSignSP( } // https://qiita.com/yoship1639/items/6dd0cc8623d7f3969d78 - if (Environment.OSVersion.Platform == PlatformID.Unix) + if (OperatingSystem.IsLinux()) //(Environment.OSVersion.Platform == PlatformID.Unix) { eCDsa = ECDsa.Create(); // ECDsaOpenSslと思われる。 eCDsa.GenerateKey(eCCurve); @@ -293,6 +373,7 @@ public static void CreateDigitalSignSP( PublicExceptionMessage.ARGUMENT_INCORRECT, "EnumDigitalSignAlgorithm parameter is incorrect."); } +#pragma warning restore CA1416 } #endregion } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSign.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSign.cs index f8849633b..4b0f15d56 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSign.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSign.cs @@ -62,11 +62,8 @@ public abstract class DigitalSign : IDisposable /// AsymmetricAlgorithm public AsymmetricAlgorithm AsymmetricAlgorithm { get; protected set; } -#if NET45 -#else /// RSASignaturePadding public RSASignaturePadding Padding = RSASignaturePadding.Pkcs1; -#endif #region Hash @@ -92,8 +89,6 @@ protected set } } -#if NET45 -#else /// HashAlgorithmName public HashAlgorithmName HashAlgorithmName { @@ -106,7 +101,7 @@ protected set this.HashAlgorithm = HashAlgorithmCmnFunc.GetHashAlgorithmFromNameString(value.Name); } } -#endif + #endregion #endregion @@ -131,15 +126,7 @@ public virtual byte[] Sign(byte[] data) { // RSA RSA rsa = (RSA)aa; -#if NET45 - if (rsa is RSACryptoServiceProvider) - { - signedByte = ((RSACryptoServiceProvider)rsa).SignData(data, this.HashAlgorithmString); - } - // NET45にRSACng、RSAOpenSsl等は無し。 -#else signedByte = rsa.SignData(data, this.HashAlgorithmName, this.Padding); -#endif } else if (aa is DSA) { @@ -169,15 +156,7 @@ public virtual bool Verify(byte[] data, byte[] sign) if (aa is RSA) { // RSA -#if NET45 - if (aa is RSACryptoServiceProvider) - { - return ((RSACryptoServiceProvider)aa).VerifyData(data, this.HashAlgorithmString, sign); - } - // NET45にRSACng、RSAOpenSsl等は無し。 -#else return ((RSA)aa).VerifyData(data, sign, this.HashAlgorithmName, this.Padding); -#endif } else if (aa is DSA) { diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaCng.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaCng.cs index 4deeeadec..f4eac2600 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaCng.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaCng.cs @@ -36,6 +36,7 @@ // CngKeyBlobFormat.EccPublicBlobでインポート・エクスポートする。 using System; +using System.Runtime.Versioning; using System.Security.Cryptography; using Touryo.Infrastructure.Public.Util; @@ -50,7 +51,10 @@ public class DigitalSignECDsaCng : DigitalSign #region mem & prop & constructor #region mem & prop - + + /// OperatingSystem + private OperatingSystem os = Environment.OSVersion; + /// _privateKey private CngKey _privateKey = null; /// PrivateKey @@ -126,18 +130,30 @@ public DigitalSignECDsaCng(CngKey cngKey, bool isPrivate) /// Constructor /// 任意鍵 /// 秘密鍵か否か + //[SupportedOSPlatform("windows")] // #if できない。 public DigitalSignECDsaCng(ECParameters ecp, bool isPrivate) { - ECDsaCng ecDsaCng = new ECDsaCng(); - ecDsaCng.ImportParameters(ecp); - CngKey cngKey = ecDsaCng.Key; +#if NETSTD + if (OperatingSystem.IsWindows()) +#else + if (os.Platform == PlatformID.Win32NT) +#endif + { + ECDsaCng ecDsaCng = new ECDsaCng(); + ecDsaCng.ImportParameters(ecp); + CngKey cngKey = ecDsaCng.Key; - this._publicKey = cngKey.Export(CngKeyBlobFormat.GenericPublicBlob); + this._publicKey = cngKey.Export(CngKeyBlobFormat.GenericPublicBlob); - if (isPrivate) - { - this._privateKey = cngKey; + if (isPrivate) + { + this._privateKey = cngKey; + } } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion @@ -149,22 +165,44 @@ public DigitalSignECDsaCng(ECParameters ecp, bool isPrivate) /// デジタル署名を作成する /// デジタル署名を行なう対象データ /// 対象データに対してデジタル署名したデジタル署名部分のデータ + //[SupportedOSPlatform("windows")] // #if できない。 public override byte[] Sign(byte[] data) { - ECDsaCng aa = new ECDsaCng(this._privateKey); - return aa.SignData(data); +#if NETSTD + if (OperatingSystem.IsWindows()) +#else + if (os.Platform == PlatformID.Win32NT) +#endif + { + ECDsaCng aa = new ECDsaCng(this._privateKey); + return aa.SignData(data); + } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } /// デジタル署名を検証する /// デジタル署名を行なった対象データ /// 対象データに対してデジタル署名したデジタル署名部分のデータ /// 検証結果( true:検証成功, false:検証失敗 ) + //[SupportedOSPlatform("windows")] // #if できない。 public override bool Verify(byte[] data, byte[] sign) { - ECDsaCng aa = new ECDsaCng(CngKey.Import( - this._publicKey, CngKeyBlobFormat.EccPublicBlob)); - - return aa.VerifyData(data, sign); +#if NETSTD + if (OperatingSystem.IsWindows()) +#else + if (os.Platform == PlatformID.Win32NT) +#endif + { + ECDsaCng aa = new ECDsaCng(CngKey.Import(this._publicKey, CngKeyBlobFormat.EccPublicBlob)); + return aa.VerifyData(data, sign); + } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } /// デジタル署名を作成する diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaOpenSsl.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaOpenSsl.cs index 6ae20f72d..24d34eb67 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaOpenSsl.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaOpenSsl.cs @@ -35,6 +35,7 @@ // ExportParameters(bool includePrivateParameters)でインポート・エクスポートする。 using System; +using System.Runtime.Versioning; using System.Security.Cryptography; using Touryo.Infrastructure.Public.Util; @@ -105,6 +106,7 @@ public DigitalSignECDsaOpenSsl(EnumDigitalSignAlgorithm eaa, HashAlgorithm hashA /// Constructor /// ECParameters（任意） /// HashAlgorithm + [SupportedOSPlatform("linux")] public DigitalSignECDsaOpenSsl(ECParameters eCParameters, HashAlgorithm hashAlgorithm) { ECDsaOpenSsl ecdsa = new ECDsaOpenSsl(eCParameters.Curve); diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaX509.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaX509.cs index 4ec5b695c..8abfe6978 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaX509.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignECDsaX509.cs @@ -90,7 +90,18 @@ public DigitalSignECDsaX509(string certificateFilePath, string password, HashAlg // X509KeyStorageFlags // - MachineKeySet : ECDsaは、インストールできない模様。 // - Exportable : PrepareでGetECDsaPrivateKeyするので。 +#if NETSTD + if (string.IsNullOrEmpty(password)) + { + this.X509Certificate = X509CertificateLoader.LoadCertificateFromFile(certificateFilePath); + } + else + { + this.X509Certificate = X509CertificateLoader.LoadPkcs12FromFile(certificateFilePath, password, flag); + } +#else this.X509Certificate = new X509Certificate2(certificateFilePath, password, flag); +#endif if (this.X509Certificate.HasPrivateKey) { diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignX509.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignX509.cs index 863c29560..979f2315e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignX509.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/DigitalSignX509.cs @@ -66,7 +66,8 @@ public AsymmetricAlgorithm PrivateKey { get { - return this.X509Certificate.PrivateKey; + //return this.X509Certificate.PrivateKey; + return this.GetPrivateKey(); } } @@ -75,7 +76,8 @@ public AsymmetricAlgorithm PublicKey { get { - return this.X509Certificate.PublicKey.Key; + //return this.X509Certificate.PublicKey.Key; + return this.GetPublicKey(); } } @@ -101,13 +103,24 @@ public DigitalSignX509( X509KeyStorageFlags flag = X509KeyStorageFlags.Exportable | X509KeyStorageFlags.MachineKeySet) { flag = flag | X509KeyStorageFlags.Exportable; // PrepareでExportParametersする可能性があるので足す。 + +#if NETSTD + if (string.IsNullOrEmpty(password)) + { + this.X509Certificate = X509CertificateLoader.LoadCertificateFromFile(certificateFilePath); + } + else + { + this.X509Certificate = X509CertificateLoader.LoadPkcs12FromFile(certificateFilePath, password, flag); + } +#else this.X509Certificate = new X509Certificate2(certificateFilePath, password, flag); +#endif + this.HashAlgorithm = HashAlgorithmCmnFunc.GetHashAlgorithmFromNameString(hashAlgorithmName); this.Prepare(); } -#if NET45 -#else /// /// Constructor /// X.509証明書(*.pfx, *.cer)からキーを設定する。 @@ -123,11 +136,23 @@ public DigitalSignX509( X509KeyStorageFlags flag = X509KeyStorageFlags.Exportable | X509KeyStorageFlags.MachineKeySet) { flag = flag | X509KeyStorageFlags.Exportable; // PrepareでExportParametersする可能性があるので足す。 + +#if NETSTD + if (string.IsNullOrEmpty(password)) + { + this.X509Certificate = X509CertificateLoader.LoadCertificateFromFile(certificateFilePath); + } + else + { + this.X509Certificate = X509CertificateLoader.LoadPkcs12FromFile(certificateFilePath, password, flag); + } +#else this.X509Certificate = new X509Certificate2(certificateFilePath, password, flag); +#endif + this.HashAlgorithm = HashAlgorithmCmnFunc.GetHashAlgorithmFromNameString(hashAlgorithmName.Name); this.Prepare(); } -#endif #endregion @@ -178,7 +203,7 @@ private void Prepare() { AsymmetricAlgorithm aa = null; - if (this.X509Certificate.PrivateKey == null) + if (this.X509Certificate.HasPrivateKey == false)//.PrivateKey == null) { // *.cer aa = this.GetPublicKey(); @@ -219,46 +244,14 @@ private void Prepare() /// AsymmetricAlgorithm private AsymmetricAlgorithm GetPrivateKey() { - AsymmetricAlgorithm aa = null; - -#if NET45 || NET46 || NETSTD - aa = this.X509Certificate.PrivateKey; -#else - if (this.X509Certificate.PublicKey.Oid.FriendlyName.ToUpper() == "DSA") - { - // DSA - aa = this.X509Certificate.GetDSAPrivateKey(); - } - else - { - // RSA - aa = this.X509Certificate.PrivateKey; - } -#endif - return aa; + return AsymmetricAlgorithmCmnFunc.GetPrivateKey(this.X509Certificate); } /// GetPublicKey /// AsymmetricAlgorithm private AsymmetricAlgorithm GetPublicKey() { - AsymmetricAlgorithm aa = null; - -#if NET45 || NET46 || NETSTD - aa = this.X509Certificate.PublicKey.Key; -#else - if (this.X509Certificate.PublicKey.Oid.FriendlyName.ToUpper() == "DSA") - { - // DSA - aa = this.X509Certificate.GetDSAPublicKey(); - } - else - { - // RSA - aa = this.X509Certificate.PublicKey.Key; - } -#endif - return aa; + return AsymmetricAlgorithmCmnFunc.GetPublicKey(this.X509Certificate); } #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumDigitalSignAlgorithm.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumDigitalSignAlgorithm.cs index c2d04afd7..eccfdc6ab 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumDigitalSignAlgorithm.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumDigitalSignAlgorithm.cs @@ -38,6 +38,22 @@ namespace Touryo.Infrastructure.Public.Security /// コンストラクタで使用している。 public enum EnumDigitalSignAlgorithm { + /// RSA:MD5 + Rsa_MD5, + + /// RSA:SHA1 + Rsa_SHA1, + + /// RSA:SHA256 + Rsa_SHA256, + + /// RSA:SHA384 + Rsa_SHA384, + + /// RSA:SHA512 + Rsa_SHA512, + + /* /// RSACryptoServiceProvider:MD5 RsaCSP_MD5, @@ -52,10 +68,11 @@ public enum EnumDigitalSignAlgorithm /// RSACryptoServiceProvider:SHA512 RsaCSP_SHA512, + */ /// DSACryptoServiceProvider:SHA1 DsaCSP_SHA1, - + /// ECDsaCng:P256 ECDsaCng_P256, @@ -66,6 +83,7 @@ public enum EnumDigitalSignAlgorithm ECDsaCng_P521, #if NETSTD + /* /// RSAOpenSsl:MD5 RsaOpenSsl_MD5, @@ -80,9 +98,15 @@ public enum EnumDigitalSignAlgorithm /// RSAOpenSsl:SHA512 RsaOpenSsl_SHA512, + */ + + ///// DSAOpenSsl:SHA1 + //DsaOpenSsl_SHA1, - /// DSAOpenSsl:SHA1 - DsaOpenSsl_SHA1, + // 古いのでリネームしたが、使用箇所でSHA1を明示している訳ではなかった... + + /// DSAOpenSsl:SHA256 + DsaOpenSsl_SHA256, /// ECDsaOpenSsl:P256 ECDsaOpenSsl_P256, @@ -93,6 +117,5 @@ public enum EnumDigitalSignAlgorithm /// ECDsaOpenSsl:P521 ECDsaOpenSsl_P521 #endif - }; } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumHashAlgorithm.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumHashAlgorithm.cs index 9ed815135..3cc6626f2 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumHashAlgorithm.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumHashAlgorithm.cs @@ -41,8 +41,24 @@ public enum EnumHashAlgorithm /// Default Default, + /// MD5 + MD5, + + /// SHA1 + SHA1, + + /// SHA256 + SHA256, + + /// SHA384 + SHA384, + + /// SHA512 + SHA512, + #region CSP (CryptoServiceProvider) + /* /// MD5CryptoServiceProvider MD5_CSP, @@ -57,6 +73,7 @@ public enum EnumHashAlgorithm /// SHA512CryptoServiceProvider SHA512_CSP, + */ #endregion @@ -86,7 +103,7 @@ public enum EnumHashAlgorithm /// RIPEMD160Managed RIPEMD160_M, - + /* /// SHA1Managed SHA1_M, @@ -98,6 +115,7 @@ public enum EnumHashAlgorithm /// SHA512Managed SHA512_M, + */ #endregion }; diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumSymmetricAlgorithm.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumSymmetricAlgorithm.cs index 6f69d25b5..763772a15 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumSymmetricAlgorithm.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/EnumSymmetricAlgorithm.cs @@ -40,8 +40,17 @@ namespace Touryo.Infrastructure.Public.Security [Flags] public enum EnumSymmetricAlgorithm { - #region CSP (CryptoServiceProvider) + /// AES + AES = 1, + /// DES + DES = 1 << 1, + /// RC2 + RC2 = 1 << 2, + /// TripleDES + TDES = 1 << 3, + #region CSP (CryptoServiceProvider) + /* /// AesCryptoServiceProvider AES_CSP = 1, /// DESCryptoServiceProvider @@ -50,7 +59,7 @@ public enum EnumSymmetricAlgorithm RC2_CSP = 1 << 2, /// TripleDESCryptoServiceProvider TDES_CSP = 1 << 3, - + */ #endregion #region CNG (CryptographyNextGeneration) @@ -63,12 +72,12 @@ public enum EnumSymmetricAlgorithm #endregion #region Managed - + /* /// AesManaged AES_M = 1 << 6, /// RijndaelManaged Rijndael_M = 1 << 7, - + */ #endregion #region CipherMode, PaddingMode指定 diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/HashAlgorithmCmnFunc.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/HashAlgorithmCmnFunc.cs index af8538929..eeb3a2d4b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/HashAlgorithmCmnFunc.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/HashAlgorithmCmnFunc.cs @@ -129,16 +129,16 @@ public static HashAlgorithm CreateHashAlgorithmSP(EnumHashAlgorithm eha) } #region MD5 - else if (eha == EnumHashAlgorithm.MD5_CSP) + else if (eha == EnumHashAlgorithm.MD5)//_CSP) { - // MD5CryptoServiceProviderサービスプロバイダ - ha = MD5CryptoServiceProvider.Create(); // devps(1703) + // MD5 + ha = MD5.Create();//MD5CryptoServiceProvider.Create(); // devps(1703) } #if NETSTD #else else if (eha == EnumHashAlgorithm.MD5_CNG) { - // MD5Cngサービスプロバイダ + // MD5Cng ha = MD5Cng.Create(); // devps(1703) } #endif @@ -150,93 +150,93 @@ public static HashAlgorithm CreateHashAlgorithmSP(EnumHashAlgorithm eha) #if NETSTD ha = null; // BouncyCastleを使用する。 #else - // RIPEMD160Managedサービスプロバイダ + // RIPEMD160Managed ha = RIPEMD160Managed.Create(); // devps(1703) #endif } #endregion #region SHA1 - else if (eha == EnumHashAlgorithm.SHA1_CSP) + else if (eha == EnumHashAlgorithm.SHA1)//_CSP) { - // SHA1CryptoServiceProviderサービスプロバイダ - ha = SHA1CryptoServiceProvider.Create(); // devps(1703) + // SHA1 + ha = SHA1.Create();//SHA1CryptoServiceProvider.Create(); // devps(1703) } #if NETSTD #else else if (eha == EnumHashAlgorithm.SHA1_CNG) { - // SHA1Cngサービスプロバイダ + // SHA1Cng ha = SHA1Cng.Create(); // devps(1703) } #endif - else if (eha == EnumHashAlgorithm.SHA1_M) + /*else if (eha == EnumHashAlgorithm.SHA1_M) { - // SHA1Managedサービスプロバイダ + // SHA1Managed ha = SHA1Managed.Create(); // devps(1703) - } + }*/ #endregion #region SHA256 - else if (eha == EnumHashAlgorithm.SHA256_CSP) + else if (eha == EnumHashAlgorithm.SHA256)//_CSP) { - // SHA256CryptoServiceProviderサービスプロバイダ - ha = SHA256CryptoServiceProvider.Create(); // devps(1703) + // SHA256 + ha = SHA256.Create(); //SHA256CryptoServiceProvider.Create(); // devps(1703) } #if NETSTD #else else if (eha == EnumHashAlgorithm.SHA256_CNG) { - // SHA256Cngサービスプロバイダ + // SHA256Cng ha = SHA256Cng.Create(); // devps(1703) } #endif - else if (eha == EnumHashAlgorithm.SHA256_M) + /*else if (eha == EnumHashAlgorithm.SHA256_M) { - // SHA256Managedサービスプロバイダ + // SHA256Managed ha = SHA256Managed.Create(); // devps(1703) - } + }*/ #endregion #region SHA384 - else if (eha == EnumHashAlgorithm.SHA384_CSP) + else if (eha == EnumHashAlgorithm.SHA384)//_CSP) { - // SHA384CryptoServiceProviderサービスプロバイダ - ha = SHA384CryptoServiceProvider.Create(); // devps(1703) + // SHA384 + ha = SHA384.Create(); //SHA384CryptoServiceProvider.Create(); // devps(1703) } #if NETSTD #else else if (eha == EnumHashAlgorithm.SHA384_CNG) { - // SHA384Cngサービスプロバイダ + // SHA384Cng ha = SHA384Cng.Create(); // devps(1703) } #endif - else if (eha == EnumHashAlgorithm.SHA384_M) + else if (eha == EnumHashAlgorithm.SHA384)//_M) { - // SHA384Managedサービスプロバイダ - ha = SHA384Managed.Create(); // devps(1703) + // SHA384 + ha = SHA384.Create(); //SHA384Managed.Create(); // devps(1703) } #endregion #region SHA512 - else if (eha == EnumHashAlgorithm.SHA512_CSP) + else if (eha == EnumHashAlgorithm.SHA512)//_CSP) { - // SHA512CryptoServiceProviderサービスプロバイダ - ha = SHA512CryptoServiceProvider.Create(); // devps(1703) + // SHA512 + ha = SHA512.Create(); // SHA512CryptoServiceProvider.Create(); // devps(1703) } #if NETSTD #else else if (eha == EnumHashAlgorithm.SHA512_CNG) { - // SHA512Cngサービスプロバイダ + // SHA512Cng ha = SHA512Cng.Create(); // devps(1703) } #endif - else if (eha == EnumHashAlgorithm.SHA512_M) + else if (eha == EnumHashAlgorithm.SHA512)//_M) { - // SHA512Managedサービスプロバイダ - ha = SHA512Managed.Create(); // devps(1703) + // SHA512 + ha = SHA512.Create(); // SHA512Managed.Create(); // devps(1703) } #endregion @@ -269,13 +269,13 @@ public static KeyedHashAlgorithm CreateKeyedHashAlgorithmSP(EnumKeyedHashAlgorit else if (ekha == EnumKeyedHashAlgorithm.HMACSHA1) { - // HMACSHA1サービスプロバイダ + // HMACSHA1 kha = new HMACSHA1(key); // devps(1703) } // -- ▼追加▼ -- else if (ekha == EnumKeyedHashAlgorithm.HMACMD5) { - // HMACMD5サービスプロバイダ + // HMACMD5 kha = new HMACMD5(key); } else if (ekha == EnumKeyedHashAlgorithm.HMACRIPEMD160) @@ -283,23 +283,23 @@ public static KeyedHashAlgorithm CreateKeyedHashAlgorithmSP(EnumKeyedHashAlgorit #if NETSTD kha = null; // BouncyCastleを使用する。 #else - // HMACRIPEMD160サービスプロバイダ + // HMACRIPEMD160 kha = new HMACRIPEMD160(key); #endif } else if (ekha == EnumKeyedHashAlgorithm.HMACSHA256) { - // HMACSHA256サービスプロバイダ + // HMACSHA256 kha = new HMACSHA256(key); } else if (ekha == EnumKeyedHashAlgorithm.HMACSHA384) { - // HMACSHA384サービスプロバイダ + // HMACSHA384 kha = new HMACSHA384(key); } else if (ekha == EnumKeyedHashAlgorithm.HMACSHA512) { - // HMACSHA512サービスプロバイダ + // HMACSHA512 kha = new HMACSHA512(key); } // -- ▲追加▲ -- @@ -308,7 +308,7 @@ public static KeyedHashAlgorithm CreateKeyedHashAlgorithmSP(EnumKeyedHashAlgorit #if NETSTD kha = null; // BouncyCastleを使用する。 #else - // MACTripleDESサービスプロバイダ + // MACTripleDES kha = new MACTripleDES(key); // devps(1703) #endif } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccKeyConverter.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccKeyConverter.cs index 02a8f3e08..10caf5fd2 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccKeyConverter.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccKeyConverter.cs @@ -50,9 +50,9 @@ public abstract class EccKeyConverter /// アルゴリズム protected string JwtConstESnnn = JwtConst.ES256; /// アルゴリズム - protected HashAlgorithmName _hashAlgorithmName = HashAlgorithmName.SHA256; + protected HashAlgorithmName HashAlgorithmName = HashAlgorithmName.SHA256; /// アルゴリズム - protected EnumHashAlgorithm HashAlgorithm = EnumHashAlgorithm.SHA256_M; + protected EnumHashAlgorithm HashAlgorithm = EnumHashAlgorithm.SHA256; /// ECCurveDic protected Dictionary ECCurveDic = new Dictionary() @@ -74,20 +74,20 @@ public EccKeyConverter(JWS_ECDSA.ES esNNN) { case JWS_ECDSA.ES._256: this.JwtConstESnnn = JwtConst.ES256; - this._hashAlgorithmName = HashAlgorithmName.SHA256; - this.HashAlgorithm = EnumHashAlgorithm.SHA256_M; + this.HashAlgorithmName = HashAlgorithmName.SHA256; + this.HashAlgorithm = EnumHashAlgorithm.SHA256; break; case JWS_ECDSA.ES._384: this.JwtConstESnnn = JwtConst.ES384; - this._hashAlgorithmName = HashAlgorithmName.SHA384; - this.HashAlgorithm = EnumHashAlgorithm.SHA384_M; + this.HashAlgorithmName = HashAlgorithmName.SHA384; + this.HashAlgorithm = EnumHashAlgorithm.SHA384; break; case JWS_ECDSA.ES._512: this.JwtConstESnnn = JwtConst.ES512; - this._hashAlgorithmName = HashAlgorithmName.SHA512; - this.HashAlgorithm = EnumHashAlgorithm.SHA512_M; + this.HashAlgorithmName = HashAlgorithmName.SHA512; + this.HashAlgorithm = EnumHashAlgorithm.SHA512; break; } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPrivateKeyConverter.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPrivateKeyConverter.cs index 449451658..0b74b20be 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPrivateKeyConverter.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPrivateKeyConverter.cs @@ -59,8 +59,7 @@ public EccPrivateKeyConverter(JWS_ECDSA.ES esNNN = JWS_ECDSA.ES._256) : base(esN #endregion #region method -#if NET45 || NET46 -#else + #region ParamToJwk /// ParamToJwk /// ECParameters @@ -124,7 +123,7 @@ public ECParameters JwkToParam(Dictionary jwk) return ecParams; } #endregion -#endif + #endregion } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPublicKeyConverter.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPublicKeyConverter.cs index 8f207738f..86fea6e49 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPublicKeyConverter.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/EccPublicKeyConverter.cs @@ -68,8 +68,6 @@ public EccPublicKeyConverter(JWS_ECDSA.ES esNNN = JWS_ECDSA.ES._256) : base(esNN #region X.509 鍵 → ECDsaProvider(Cngkey, ECParameters) → Jwk // X.509 は、NET47以降 -#if NET45 || NET46 -#else #region *.cer #region Jwk @@ -116,7 +114,7 @@ public ECDsa X509CerToProvider( // PublicKey を取り出すため Exportableは不要 // ASP.NET（サーバ）からの実行を想定しないため、MachineKeySetは不要 DigitalSignECDsaX509 dsX509 = new DigitalSignECDsaX509( - certificateFilePath, "", this._hashAlgorithmName, flg); + certificateFilePath, "", this.HashAlgorithmName, flg); AsymmetricAlgorithm aa = dsX509.PublicKey; if (aa is ECDsa) @@ -188,7 +186,6 @@ public ECDsa X509PfxToProvider( #endregion #endregion -#endif #endregion @@ -269,8 +266,7 @@ public CngKey JwkToCng(Dictionary jwk) #endregion #region ECParameters -#if NET45 || NET46 -#else + // ECCurve and ECParameters to Jwt // https://github.com/psteniusubi/jose-jwt/blob/master/jose-jwt/jwk/JwkEc.cs @@ -333,7 +329,7 @@ public ECParameters JwkToParam(JObject jwkObject) return ecParams; } #endregion -#endif + #endregion #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_Rsa15A128CbcHS256.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_Rsa15A128CbcHS256.cs index 640f2bc4a..004d38a6d 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_Rsa15A128CbcHS256.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_Rsa15A128CbcHS256.cs @@ -69,24 +69,6 @@ public JWE_Rsa15A128CbcHS256() #region CEK 暗号化・復号化 -#if NET45 - /// CEK 暗号化 - /// byte[] - /// byte[] - protected override byte[] CreateKey(byte[] data) - { - // RSAES-PKCS1-v1_5 は、fOAEP: false - return this.ASymmetricCryptography.EncryptBytes(data, fOAEP: false); - } - - /// CEK 復号化 - /// byte[] - /// byte[] - protected override byte[] DecryptKey(byte[] data) - { - return this.ASymmetricCryptography.DecryptBytes(data, fOAEP: false); - } -#else /// CEK 暗号化 /// byte[] /// byte[] @@ -105,7 +87,7 @@ protected override byte[] DecryptKey(byte[] data) return this.ASymmetricCryptography.DecryptBytes( data, padding: RSAEncryptionPadding.Pkcs1); } -#endif + #endregion #region 本文 暗号化・復号化 diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_RsaOaepAesGcm.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_RsaOaepAesGcm.cs index cc0202bd5..b7e5a745e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_RsaOaepAesGcm.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWE_RsaOaepAesGcm.cs @@ -66,25 +66,6 @@ public JWE_RsaOaepAesGcm() #region CEK 暗号化・復号化 -#if NET45 - /// CEK 暗号化 - /// byte[] - /// byte[] - protected override byte[] CreateKey(byte[] data) - { - // RSA-OAEP = RSAES OAEP using default parameters は、 - // SHA-1ハッシュ関数とSHA-1マスク生成機能付きMGF1 - return this.ASymmetricCryptography.EncryptBytes(data, fOAEP: true); - } - - /// CEK 復号化 - /// byte[] - /// byte[] - protected override byte[] DecryptKey(byte[] data) - { - return this.ASymmetricCryptography.DecryptBytes(data, fOAEP: true); - } -#else /// CEK 暗号化 /// byte[] /// byte[] @@ -104,7 +85,7 @@ protected override byte[] DecryptKey(byte[] data) return this.ASymmetricCryptography.DecryptBytes( data, padding: RSAEncryptionPadding.OaepSHA1); } -#endif + #endregion #region 本文 暗号化・復号化 diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES256_Param.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES256_Param.cs index 15252928d..1ac3ad38b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES256_Param.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES256_Param.cs @@ -108,9 +108,7 @@ public JWS_ES256_Param() else { #if NETSTD - this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - JWS_ES256.DigitalSignAlgorithm, SHA256CryptoServiceProvider.Create()); - //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA256_M)); + this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl(JWS_ES256.DigitalSignAlgorithm, SHA256.Create()); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif @@ -123,20 +121,30 @@ public JWS_ES256_Param() public JWS_ES256_Param(ECParameters param, bool isPrivate) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { this.DigitalSignECDsaCng = new DigitalSignECDsaCng(param, isPrivate); } - else +#if NETSTD + else if (OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD - this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - param, SHA256CryptoServiceProvider.Create()); - //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA256_M)); + this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl(param, SHA256.Create()); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion @@ -148,7 +156,11 @@ public JWS_ES256_Param(ECParameters param, bool isPrivate) /// byte[] protected override byte[] Create2(byte[] data) { +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Sign(data); } @@ -169,7 +181,11 @@ protected override byte[] Create2(byte[] data) protected override bool Verify2(byte[] data, byte[] sign) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Verify(data, sign); } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES384_Param.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES384_Param.cs index da156da2e..799944939 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES384_Param.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES384_Param.cs @@ -108,7 +108,7 @@ public JWS_ES384_Param() { #if NETSTD this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - JWS_ES384.DigitalSignAlgorithm, SHA384CryptoServiceProvider.Create()); + JWS_ES384.DigitalSignAlgorithm, SHA384.Create()); //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA384_M)); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); @@ -122,20 +122,30 @@ public JWS_ES384_Param() public JWS_ES384_Param(ECParameters param, bool isPrivate) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { this.DigitalSignECDsaCng = new DigitalSignECDsaCng(param, isPrivate); } - else +#if NETSTD + else if (OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD - this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - param, SHA384CryptoServiceProvider.Create()); - //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA384_M)); + this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl(param, SHA384.Create()); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion @@ -147,11 +157,19 @@ public JWS_ES384_Param(ECParameters param, bool isPrivate) /// byte[] protected override byte[] Create2(byte[] data) { +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Sign(data); } - else +#if NETSTD + else if (OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD return this.DigitalSignECDsaOpenSsl.Sign(data); @@ -159,6 +177,10 @@ protected override byte[] Create2(byte[] data) throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } /// Verify2 @@ -168,11 +190,19 @@ protected override byte[] Create2(byte[] data) protected override bool Verify2(byte[] data, byte[] sign) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Verify(data, sign); } - else +#if NETSTD + else if (OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD return this.DigitalSignECDsaOpenSsl.Verify(data, sign); @@ -180,6 +210,10 @@ protected override bool Verify2(byte[] data, byte[] sign) throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES512_Param.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES512_Param.cs index 924afc9c7..abdafcbf8 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES512_Param.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_ES512_Param.cs @@ -35,6 +35,7 @@ using Touryo.Infrastructure.Public.Util; using Touryo.Infrastructure.Public.Security; +using System.Diagnostics.Eventing.Reader; namespace Touryo.Infrastructure.Public.Security.Jwt { @@ -107,9 +108,7 @@ public JWS_ES512_Param() else { #if NETSTD - this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - JWS_ES512.DigitalSignAlgorithm, SHA512CryptoServiceProvider.Create()); - //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA512_M)); + this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl(JWS_ES512.DigitalSignAlgorithm, SHA512.Create()); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif @@ -122,20 +121,31 @@ public JWS_ES512_Param() public JWS_ES512_Param(ECParameters param, bool isPrivate) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { this.DigitalSignECDsaCng = new DigitalSignECDsaCng(param, isPrivate); } - else +#if NETSTD + else if(OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD - this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - param, SHA512CryptoServiceProvider.Create()); + this.DigitalSignECDsaOpenSsl = new DigitalSignECDsaOpenSsl(param, SHA512.Create()); //HashAlgorithmCmnFunc.CreateHashAlgorithmSP(EnumHashAlgorithm.SHA512_M)); #else throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion @@ -147,11 +157,19 @@ public JWS_ES512_Param(ECParameters param, bool isPrivate) /// byte[] protected override byte[] Create2(byte[] data) { +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Sign(data); } - else +#if NETSTD + else if(OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD return this.DigitalSignECDsaOpenSsl.Sign(data); @@ -159,6 +177,10 @@ protected override byte[] Create2(byte[] data) throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } /// Verify2 @@ -168,11 +190,19 @@ protected override byte[] Create2(byte[] data) protected override bool Verify2(byte[] data, byte[] sign) { // Cng or OpenSsl +#if NETSTD + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { return this.DigitalSignECDsaCng.Verify(data, sign); } - else +#if NETSTD + else if(OperatingSystem.IsLinux()) +#else + else if (os.Platform == PlatformID.Unix) +#endif { #if NETSTD return this.DigitalSignECDsaOpenSsl.Verify(data, sign); @@ -180,6 +210,10 @@ protected override bool Verify2(byte[] data, byte[] sign) throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); #endif } + else + { + throw new NotImplementedException(PublicExceptionMessage.NOT_IMPLEMENTED); + } } #endregion diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS256.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS256.cs index 625d7df97..825b2e956 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS256.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS256.cs @@ -58,7 +58,10 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { get { + return EnumDigitalSignAlgorithm.Rsa_SHA256; + #if NETSTD + /* if (Environment.OSVersion.Platform == PlatformID.Win32NT) { return EnumDigitalSignAlgorithm.RsaCSP_SHA256; @@ -67,8 +70,9 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { return EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256; } + */ #else - return EnumDigitalSignAlgorithm.RsaCSP_SHA256; + //return EnumDigitalSignAlgorithm.RsaCSP_SHA256; #endif } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS384.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS384.cs index 0fdfdbc7a..daee962f6 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS384.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS384.cs @@ -53,7 +53,10 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { get { + return EnumDigitalSignAlgorithm.Rsa_SHA384; + #if NETSTD + /* if (Environment.OSVersion.Platform == PlatformID.Win32NT) { return EnumDigitalSignAlgorithm.RsaCSP_SHA384; @@ -62,8 +65,9 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { return EnumDigitalSignAlgorithm.RsaOpenSsl_SHA384; } + */ #else - return EnumDigitalSignAlgorithm.RsaCSP_SHA384; + //return EnumDigitalSignAlgorithm.RsaCSP_SHA384; #endif } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS512.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS512.cs index 999773468..8346b1ed4 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS512.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/JWS_RS512.cs @@ -53,7 +53,9 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { get { + return EnumDigitalSignAlgorithm.Rsa_SHA512; #if NETSTD + /* if (Environment.OSVersion.Platform == PlatformID.Win32NT) { return EnumDigitalSignAlgorithm.RsaCSP_SHA512; @@ -62,8 +64,9 @@ public static EnumDigitalSignAlgorithm DigitalSignAlgorithm { return EnumDigitalSignAlgorithm.RsaOpenSsl_SHA512; } + */ #else - return EnumDigitalSignAlgorithm.RsaCSP_SHA512; + //return EnumDigitalSignAlgorithm.RsaCSP_SHA512; #endif } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/RsaKeyConverter.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/RsaKeyConverter.cs index 4c6e9e95b..2310283bd 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/RsaKeyConverter.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Jwt/RsaKeyConverter.cs @@ -43,7 +43,7 @@ public abstract class RsaKeyConverter /// アルゴリズム protected string HashName = HashNameConst.SHA256; /// アルゴリズム - protected EnumHashAlgorithm HashAlgorithm = EnumHashAlgorithm.SHA256_M; + protected EnumHashAlgorithm HashAlgorithm = EnumHashAlgorithm.SHA256; #endregion #region constructor @@ -58,19 +58,19 @@ public RsaKeyConverter(JWS_RSA.RS rsNNN) case JWS_RSA.RS._256: this.JwtConstRSnnn = JwtConst.RS256; this.HashName = HashNameConst.SHA256; - this.HashAlgorithm = EnumHashAlgorithm.SHA256_M; + this.HashAlgorithm = EnumHashAlgorithm.SHA256; break; case JWS_RSA.RS._384: this.JwtConstRSnnn = JwtConst.RS384; this.HashName = HashNameConst.SHA384; - this.HashAlgorithm = EnumHashAlgorithm.SHA384_M; + this.HashAlgorithm = EnumHashAlgorithm.SHA384; break; case JWS_RSA.RS._512: this.JwtConstRSnnn = JwtConst.RS512; this.HashName = HashNameConst.SHA512; - this.HashAlgorithm = EnumHashAlgorithm.SHA512_M; + this.HashAlgorithm = EnumHashAlgorithm.SHA512; break; } } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaBob.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaBob.cs index b9db717d3..17aec77d0 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaBob.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaBob.cs @@ -31,6 +31,7 @@ //* 2018/11/09 西野 大介 RSAOpenSsl、DSAOpenSsl、HashAlgorithmName対応 //********************************************************************************** +using System; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; @@ -64,11 +65,24 @@ protected RsaBob(string rsaPfxFilePath, string password) : /// X509KeyStorageFlags protected RsaBob(string rsaPfxFilePath, string password, X509KeyStorageFlags flag) { +#if NETSTD + X509Certificate2 x509Certificate = null; + + //if (string.IsNullOrEmpty(password)) + //{ + // x509Certificate = X509CertificateLoader.LoadCertificateFromFile(rsaPfxFilePath); + //} + //else + //{ + x509Certificate = X509CertificateLoader.LoadPkcs12FromFile(rsaPfxFilePath, password, flag); + //} +#else X509Certificate2 x509Certificate = new X509Certificate2(rsaPfxFilePath, password, flag); - +#endif + // RSA // *.pfxの場合、ExportParameters(true)して生成し直している。 - AsymmetricAlgorithm aa = x509Certificate.PrivateKey; + AsymmetricAlgorithm aa = AsymmetricAlgorithmCmnFunc.GetPrivateKey(x509Certificate); RSA rsa = (RSA)AsymmetricAlgorithmCmnFunc.CreateSameKeySizeSP(aa); rsa.ImportParameters(((RSA)(aa)).ExportParameters(true)); diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepAlice.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepAlice.cs index fddcfbf0a..a49ab197e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepAlice.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepAlice.cs @@ -53,7 +53,7 @@ public RsaOaepAlice(RSAParameters rsaParams) : base(rsaParams) { } protected override void CreateKeys() { RSA rsa = (RSA)this._asa; - this._aes = new AesCryptoServiceProvider(); // 秘密鍵 + this._aes = Aes.Create(); // 秘密鍵 RSAOAEPKeyExchangeFormatter keyExchangeFormatter = new RSAOAEPKeyExchangeFormatter(rsa); this._exchangeKey = keyExchangeFormatter.CreateKeyExchange(this._aes.Key, typeof(Aes)); // 交換鍵 } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepBob.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepBob.cs index af9acbba7..1cc6b6a24 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepBob.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaOaepBob.cs @@ -61,7 +61,7 @@ public RsaOaepBob(string rsaPfxFilePath, string password, X509KeyStorageFlags fl /// 初期化ベクター public void GeneratePrivateKey(byte[] exchangeKeyOfAlice, byte[] iv) { - this._aes = new AesCryptoServiceProvider(); + this._aes = Aes.Create(); RSAOAEPKeyExchangeDeformatter keyExchangeDeformatter = new RSAOAEPKeyExchangeDeformatter(this._asa); this._aes.Key = keyExchangeDeformatter.DecryptKeyExchange(exchangeKeyOfAlice); diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Alice.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Alice.cs index a21ef7ddb..54ef5b5ac 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Alice.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Alice.cs @@ -53,7 +53,7 @@ public RsaPkcs1Alice(RSAParameters rsaParams) : base(rsaParams) { } protected override void CreateKeys() { RSA rsa = (RSA)this._asa; - this._aes = new AesCryptoServiceProvider(); // 秘密鍵 + this._aes = Aes.Create(); // 秘密鍵 RSAPKCS1KeyExchangeFormatter keyExchangeFormatter = new RSAPKCS1KeyExchangeFormatter(rsa); this._exchangeKey = keyExchangeFormatter.CreateKeyExchange(this._aes.Key, typeof(Aes)); // 交換鍵 } diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Bob.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Bob.cs index 636f95132..7b633ef40 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Bob.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/KeyExg/RsaPkcs1Bob.cs @@ -61,7 +61,7 @@ public RsaPkcs1Bob(string rsaPfxFilePath, string password, X509KeyStorageFlags f /// 初期化ベクター public void GeneratePrivateKey(byte[] exchangeKeyOfAlice, byte[] iv) { - this._aes = new AesCryptoServiceProvider(); + this._aes = Aes.Create();//new AesCryptoServiceProvider(); RSAPKCS1KeyExchangeDeformatter keyExchangeDeformatter = new RSAPKCS1KeyExchangeDeformatter(this._asa); this._aes.Key = keyExchangeDeformatter.DecryptKeyExchange(exchangeKeyOfAlice); diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/MyDebug.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/MyDebug.cs new file mode 100644 index 000000000..1cb446576 --- /dev/null +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/MyDebug.cs @@ -0,0 +1,216 @@ +//********************************************************************************** +//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. +//********************************************************************************** + +#region Apache License +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#endregion + +//********************************************************************************** +//* クラス名 ：MyDebug +//* クラス日本語名 ：MyDebugクラス +//* +//* 作成者 ：生技 西野 +//* 更新履歴 ： +//* +//* 日時 更新者 内容 +//* ---------- ---------------- ------------------------------------------------- +//* 2018/11/12 西野 大介 新規作成（X PlatformのDebugで利用拡大？ +//* 2018/11/29 西野 大介 ASP.NET Coreの出力で2つ出力されるので... +//* 2019/03/20 西野 大介 リネーム（名前空間、クラス名、メソッド名） +//********************************************************************************** + +using System; +using System.Security.Cryptography.X509Certificates; + +using Touryo.Infrastructure.Public.Str; + +namespace Touryo.Infrastructure.Public.Security +{ + /// MyDebugクラス + public class MyDebug : Touryo.Infrastructure.Public.Diagnostics.MyDebug + { + #region JWT + + /// InspectJwt + /// string + /// string + public static void InspectJwt(string testLabel, string jwt) + { + string[] aryStr = jwt.Split('.'); + + if (aryStr.Length == 3) + { + MyDebug.InspectJws(testLabel, aryStr); + } + else if (aryStr.Length == 5) + { + MyDebug.InspectJwe(testLabel, aryStr); + } + else { } + } + + #region JWS + + /// InspectJws + /// string + /// string[] + public static void InspectJws(string testLabel, string[] jws) + { + MyDebug.OutputDebugAndConsole(testLabel, "JWS Header: " + + CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jws[0]), CustomEncode.UTF_8)); + + MyDebug.OutputDebugAndConsole(testLabel, "JWS Payload: " + + CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jws[1]), CustomEncode.UTF_8)); + + MyDebug.OutputDebugAndConsole(testLabel, "JWS Signature: " + jws[2]); + } + + #endregion + + #region JWE + + /// InspectJwe + /// string + /// string[] + public static void InspectJwe(string testLabel, string[] jwe) + { + MyDebug.OutputDebugAndConsole(testLabel, "JWE Header: " + + CustomEncode.ByteToString(CustomEncode.FromBase64UrlString(jwe[0]), CustomEncode.UTF_8)); + + MyDebug.OutputDebugAndConsole(testLabel, "JWE Encrypted Key: " + jwe[1]); + MyDebug.OutputDebugAndConsole(testLabel, "JWE Initialization Vector: " + jwe[2]); + MyDebug.OutputDebugAndConsole(testLabel, "JWE Ciphertext: " + jwe[3]); + MyDebug.OutputDebugAndConsole(testLabel, "JWE Authentication Tag: " + jwe[4]); + } + + #endregion + + #endregion + + #region X.509 + + /// InspectPrivateX509Key + /// string + /// X509Certificate2 + public static void InspectPrivateX509Key(string testLabel, X509Certificate2 privateX509Key) + { + // X509Certificate2.PrivateKey + MyDebug.OutputDebugAndConsole( + testLabel, "X509Certificate2.PrivateKey: " + + (privateX509Key == null ? "is null" : "is not null")); + + if (privateX509Key == null) + { + return; + } + + // SignatureAlgorithm.FriendlyName + try + { + MyDebug.OutputDebugAndConsole( + testLabel, "SignatureAlgorithm.FriendlyName: " + + privateX509Key.SignatureAlgorithm.FriendlyName); + } + catch (Exception ex) + { + MyDebug.OutputDebugAndConsole( + testLabel, "SignatureAlgorithm.FriendlyName: " + + ex.GetType().ToString() + ", " + ex.Message); + } + + // PrivateKey.ToString() + try + { + if (privateX509Key.HasPrivateKey) + { + MyDebug.OutputDebugAndConsole( + testLabel, "PrivateKey.ToString(): " + //+ (privateX509Key.PrivateKey == null ? "is null" : "is " + //+ privateX509Key.PrivateKey.ToString())); + + (AsymmetricAlgorithmCmnFunc.GetPrivateKey(privateX509Key) == null ? "is null" : "is " + + AsymmetricAlgorithmCmnFunc.GetPrivateKey(privateX509Key).ToString())); + } + } + catch (Exception ex) + { + MyDebug.OutputDebugAndConsole( + testLabel, "PrivateKey.ToString(): " + + ex.GetType().ToString() + ", " + ex.Message); + } + } + + /// InspectPublicX509Key + /// string + /// X509Certificate2 + public static void InspectPublicX509Key(string testLabel, X509Certificate2 publicX509Key) + { + // X509Certificate2.PublicKey + MyDebug.OutputDebugAndConsole( + testLabel, "publicX509Key: " + + (publicX509Key == null ? "is null" : "is not null")); + if (publicX509Key == null) + { + return; + } + + // SignatureAlgorithm.FriendlyName + try + { + MyDebug.OutputDebugAndConsole( + testLabel, "SignatureAlgorithm.FriendlyName: " + + publicX509Key.SignatureAlgorithm.FriendlyName); + } + catch (Exception ex) + { + MyDebug.OutputDebugAndConsole( + testLabel, "SignatureAlgorithm.FriendlyName: " + + ex.GetType().ToString() + ", " + ex.Message); + } + + // PublicKey.ToString() + if (publicX509Key.PublicKey != null) + { + MyDebug.OutputDebugAndConsole( + testLabel, "PublicKey.ToString(): " + + (publicX509Key.PublicKey == null ? "is null" : "is " + + publicX509Key.PublicKey.ToString())); + + // PublicKey.Key.ToString() + try + { + //if (publicX509Key.PublicKey.Key != null) + //{ + + MyDebug.OutputDebugAndConsole( + testLabel, "PublicKey.Key.ToString(): " + //+ (publicX509Key.PublicKey.Key == null ? "is null" : "is " + //+ publicX509Key.PublicKey.Key.ToString())); + + (AsymmetricAlgorithmCmnFunc.GetPublicKey(publicX509Key) == null ? "is null" : "is " + + (AsymmetricAlgorithmCmnFunc.GetPublicKey(publicX509Key).ToString()))); + //} + } + catch (Exception ex) + { + MyDebug.OutputDebugAndConsole( + testLabel, "PublicKey.Key.ToString(): " + + ex.GetType().ToString() + ", " + ex.Message); + } + } + } + + #endregion + } +} diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/PrivacyEnhancedMail.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/PrivacyEnhancedMail.cs index 5de7aa0b9..341812f3e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/PrivacyEnhancedMail.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/PrivacyEnhancedMail.cs @@ -244,9 +244,15 @@ public static X509Certificate2 GetX509FromPemFilePath(string pemFilePath, RFC746 { string pemString = File.ReadAllText(pemFilePath); +#if NETSTD + return X509CertificateLoader.LoadCertificate( + PrivacyEnhancedMail.GetBytesFromPemString( + pemString, PrivacyEnhancedMail.EnumToString(label))); +#else return new X509Certificate2( PrivacyEnhancedMail.GetBytesFromPemString( pemString, PrivacyEnhancedMail.EnumToString(label))); +#endif } /// GetBase64StringFromPemFilePath diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_net48.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_net48.csproj index 3fe983aa8..4cbe5694a 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_net48.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_net48.csproj @@ -76,6 +76,7 @@ + diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore80.csproj b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore100.csproj similarity index 71% rename from root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore80.csproj rename to root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore100.csproj index e507eb928..e19bfe877 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore80.csproj +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Public.Security_netcore100.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 OpenTouryo.Public.Security Touryo.Infrastructure.Public.Security 3.0.0.0 @@ -10,16 +10,16 @@ TRACE;DEBUG;NETSTD - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0\OpenTouryo.Public.Security.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0\OpenTouryo.Public.Security.xml full true TRACE;NETSTD - ..\..\Build_netcore80\ - ..\..\Build_netcore80\net8.0\OpenTouryo.Public.Security.xml + ..\..\Build_netcore100\ + ..\..\Build_netcore100\net10.0\OpenTouryo.Public.Security.xml portable true @@ -40,8 +40,6 @@ - - @@ -50,7 +48,7 @@ - + diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPassword.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPassword.cs index 9e1f15a28..5e89f8759 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPassword.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPassword.cs @@ -64,7 +64,11 @@ public static string Base64UrlSecret(int byteSize) public static byte[] RandomByte(int byteSize) { byte[] data = new byte[byteSize]; +#if NETSTD + RandomNumberGenerator.Fill(data); +#else RNGCryptoServiceProvider.Create().GetBytes(data); +#endif return data; } @@ -78,8 +82,6 @@ public static string Generate(int length, int numberOfNonAlphanumericCharacters) // ASP.NETを使ってランダムなパスワードを生成する － インターネットコム // https://internetcom.jp/developer/20060131/26.html - RNGCryptoServiceProvider rng = null; - if ((length < 1) || (length > 128)) { throw new ArgumentException("Password length is incorrect."); @@ -101,9 +103,13 @@ public static string Generate(int length, int numberOfNonAlphanumericCharacters) char[] chPunctuations = "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~".ToCharArray(); //"!@@$%^^*()_-+=[{]};:>|./?".ToCharArray(); // Get a cryptographically strong series of bytes +#if NETSTD + RandomNumberGenerator.Fill(bufferPwd); +#else + RNGCryptoServiceProvider rng = null; rng = new RNGCryptoServiceProvider(); rng.GetBytes(bufferPwd); - +#endif // C# ASCII Table - Dot Net Perls // https://www.dotnetperls.com/ascii-table @@ -136,11 +142,21 @@ public static string Generate(int length, int numberOfNonAlphanumericCharacters) // 0-lengthの位置に、適当なNAC文字を入れる。 // Get a cryptographically strong series of bytes + + // index選択用 +#if NETSTD + RandomNumberGenerator.Fill(bufferSelectIdx); +#else rng = new RNGCryptoServiceProvider(); - rng.GetBytes(bufferSelectIdx); // index選択用 + rng.GetBytes(bufferSelectIdx); +#endif + // char選択用 +#if NETSTD + RandomNumberGenerator.Fill(bufferSelectChar); +#else rng = new RNGCryptoServiceProvider(); - rng.GetBytes(bufferSelectChar); // char選択用 - + rng.GetBytes(bufferSelectChar); +#endif List list = new List(); list.AddRange(chPunctuations); // .Contains() を使いたい。 diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV1.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV1.cs index bd4619028..873183a65 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV1.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV1.cs @@ -20,7 +20,7 @@ //********************************************************************************** //* クラス名 ：GetPasswordHashV1（旧 GetKeyedHashクラスの実装を内包） -//* クラス日本語名 ：Passwordハッシュを取得するクラス（v1 +//* クラス日本語名 ：Password Hashを取得するクラス（v1 //* //* 作成者 ：生技 西野 //* 更新履歴 ： @@ -30,7 +30,7 @@ //* 2013/02/15 西野 大介 新規作成 //* 2014/03/13 西野 大介 devps(1703):Createメソッドを使用してcryptoオブジェクトを作成します。 //* 2014/03/13 西野 大介 devps(1725):暗号クラスの使用終了時にデータをクリアする。 -//* 2017/01/10 西野 大介 ストレッチ回数とsaltのpublic property procedureを追加 +//* 2017/01/10 西野 大介 Stretch回数とsaltのpublic property procedureを追加 //* 2017/01/10 西野 大介 HMAC(HMACMD5、HMACRIPEMD160、HMACSHA256、HMACSHA384、HMACSHA512)を追加 //* 2017/01/10 西野 大介 全てHMACSHA1になる問題があったため、KeyedHashAlgorithm生成方法を変更。 //* 2017/01/10 西野 大介 GetSaltedPasswordとEqualSaltedPasswordを追加。 @@ -50,26 +50,26 @@ namespace Touryo.Infrastructure.Public.Security.Pwd { - /// Passwordハッシュを取得するクラス（v1 + /// Password Hashを取得するクラス（v1 [Obsolete("GetPasswordHashV1 is deprecated, please use GetPasswordHashV2 instead.")] public class GetPasswordHashV1 { #region mem & prop - /// ソルト + /// salt private static string _salt = "Touryo.Infrastructure.Public.Util.GetKeyedHash.Salt"; - /// ソルト + /// salt public static string Salt { get { return GetPasswordHashV1._salt; } set { GetPasswordHashV1._salt = value; } } - /// ストレッチ回数 + /// Stretch回数 private static int _stretchCount = 0; - /// ストレッチ回数 + /// Stretch回数 public static int StretchCount { get { return GetPasswordHashV1._stretchCount; } @@ -85,8 +85,8 @@ public static int StretchCount /// Salted and hashed passwordとして保存する必要がある。 /// /// >Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 - /// ソルトの文字列長 + /// Hashアルゴリズム列挙型 + /// saltの文字列長 /// Salted and hashed password. /// public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha, int saltLength) @@ -100,13 +100,13 @@ public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha /// Salted and hashed passwordとして保存する必要がある。 /// /// >Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 - /// ソルトの文字列長 - /// ストレッチ回数 + /// Hashアルゴリズム列挙型 + /// saltの文字列長 + /// Stretch回数 /// Salted and hashed password. public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha, int saltLength, int stretchCount) { - // ランダム・ソルト文字列を生成（区切り記号は含まなくても良い） + // ランダムsalt文字列を生成（区切り記号は含まなくても良い） string salt = GetPassword.Generate(saltLength, 0); //Membership.GeneratePassword(saltLength, 0); // Salted and hashed password（文字列）を生成して返す。 @@ -119,14 +119,14 @@ public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha /// パスワードを比較して認証する。 /// Password entered by the user. /// Salted and hashed password. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// /// true：パスワードは一致した。 /// false：パスワードは一致しない。 /// public static bool EqualSaltedPassword(string rawPassword, string saltedPassword, EnumHashAlgorithm eha) { - // ソルト部分を取得 + // salt部分を取得 string[] temp = saltedPassword.Split('.'); string salt = CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[0]), CustomEncode.UTF_8); int stretchCount = int.Parse(CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[1]), CustomEncode.UTF_8)); @@ -154,9 +154,9 @@ public static bool EqualSaltedPassword(string rawPassword, string saltedPassword /// Salted and hashed passwordとして保存する必要がある。 /// /// Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// キー（システム共通） - /// ソルトの文字列長 + /// saltの文字列長 /// Salted and hashed password. /// public static string GetSaltedPassword(string rawPassword, EnumKeyedHashAlgorithm ekha, string key, int saltLength) @@ -170,14 +170,14 @@ public static string GetSaltedPassword(string rawPassword, EnumKeyedHashAlgorith /// Salted and hashed passwordとして保存する必要がある。 /// /// Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// キー - /// ソルトの文字列長 - /// ストレッチ回数 + /// saltの文字列長 + /// Stretch回数 /// Salted and hashed password. public static string GetSaltedPassword(string rawPassword, EnumKeyedHashAlgorithm ekha, string key, int saltLength, int stretchCount) { - // ランダム・ソルト文字列を生成（区切り記号は含まなくても良い） + // ランダムsalt文字列を生成（区切り記号は含まなくても良い） string salt = GetPassword.Generate(saltLength, 0); //Membership.GeneratePassword(saltLength, 0); byte[] saltByte = CustomEncode.StringToByte(salt, CustomEncode.UTF_8); @@ -193,14 +193,15 @@ public static string GetSaltedPassword(string rawPassword, EnumKeyedHashAlgorith /// パスワードを比較して認証する。 /// Password entered by the user. /// Salted and hashed password. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 + /// Hashアルゴリズム名（Stretching用） /// /// true：パスワードは一致した。 /// false：パスワードは一致しない。 /// - public static bool EqualSaltedPassword(string rawPassword, string saltedPassword, EnumKeyedHashAlgorithm ekha) + public static bool EqualSaltedPassword(string rawPassword, string saltedPassword, EnumKeyedHashAlgorithm ekha, HashAlgorithmName han) { - // ソルト部分を取得 + // salt部分を取得 string[] temp = saltedPassword.Split('.'); string key = CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[0]), CustomEncode.UTF_8); byte[] saltByte = CustomEncode.FromBase64String(temp[1]); @@ -209,7 +210,7 @@ public static bool EqualSaltedPassword(string rawPassword, string saltedPassword string hashedPassword = CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[3]), CustomEncode.UTF_8); // 引数のsaltedPasswordと、rawPasswordから自作したsaltedPasswordを比較 - if (hashedPassword == GetPasswordHashV1.GetKeyedHashString(salt + rawPassword, ekha, key, saltByte, stretchCount)) + if (hashedPassword == GetPasswordHashV1.GetKeyedHashString(salt + rawPassword, ekha, key, saltByte, stretchCount, han)) { // 一致した。 return true; @@ -225,89 +226,115 @@ public static bool EqualSaltedPassword(string rawPassword, string saltedPassword #region String - /// 文字列のハッシュ値を計算して返す。 + /// 文字列のHash値を計算して返す。 /// 文字列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ハッシュ値（文字列） + /// Hash値（文字列） private static string GetKeyedHashString(string ss, EnumKeyedHashAlgorithm ekha, string password) { return GetPasswordHashV1.GetKeyedHashString( ss, ekha, password, CustomEncode.StringToByte(GetPasswordHashV1._salt, CustomEncode.UTF_8), GetPasswordHashV1.StretchCount); } - /// 文字列のハッシュ値を計算して返す。 + /// 文字列のHash値を計算して返す。 /// 文字列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ソルト - /// ハッシュ値（文字列） + /// salt + /// Hash値（文字列） private static string GetKeyedHashString(string ss, EnumKeyedHashAlgorithm ekha, string password, byte[] salt) { - return GetPasswordHashV1.GetKeyedHashString( - ss, ekha, password, salt, GetPasswordHashV1.StretchCount); + return GetPasswordHashV1.GetKeyedHashString(ss, ekha, password, salt, GetPasswordHashV1.StretchCount); } - /// 文字列のハッシュ値を計算して返す。 + /// 文字列のHash値を計算して返す。 /// 文字列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ソルト - /// ストレッチ回数 - /// ハッシュ値（文字列） + /// salt + /// Stretch回数 + /// Hash値（文字列） private static string GetKeyedHashString(string ss, EnumKeyedHashAlgorithm ekha, string password, byte[] salt, int stretching) + { + return GetPasswordHashV1.GetKeyedHashString(ss, ekha, password, salt, GetPasswordHashV1.StretchCount, HashAlgorithmName.SHA256); + } + + /// 文字列のHash値を計算して返す。 + /// 文字列 + /// Keyed Hashアルゴリズム列挙型 + /// 使用するパスワード + /// salt + /// Stretch回数 + /// Hashアルゴリズム名（Stretching用） + /// Hash値（文字列） + private static string GetKeyedHashString( + string ss, EnumKeyedHashAlgorithm ekha, string password, byte[] salt, int stretching, HashAlgorithmName han) { return CustomEncode.ToBase64String( - GetKeyedHashBytes(CustomEncode.StringToByte(ss, CustomEncode.UTF_8), ekha, password, salt, stretching)); + GetKeyedHashBytes(CustomEncode.StringToByte(ss, CustomEncode.UTF_8), ekha, password, salt, stretching, han)); } #endregion #region Bytes - /// バイト配列のハッシュ値を計算して返す。 - /// バイト配列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Byte配列のHash値を計算して返す。 + /// Byte配列 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ハッシュ値（バイト配列） + /// Hash値（Byte配列） private static byte[] GetKeyedHashBytes(byte[] asb, EnumKeyedHashAlgorithm ekha, string password) { return GetPasswordHashV1.GetKeyedHashBytes( asb, ekha, password, CustomEncode.StringToByte(GetPasswordHashV1._salt, CustomEncode.UTF_8), GetPasswordHashV1.StretchCount); } - /// バイト配列のハッシュ値を計算して返す。 - /// バイト配列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Byte配列のHash値を計算して返す。 + /// Byte配列 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ソルト - /// ハッシュ値（バイト配列） + /// salt + /// Hash値（Byte配列） private static byte[] GetKeyedHashBytes(byte[] asb, EnumKeyedHashAlgorithm ekha, string password, byte[] salt) { - return GetPasswordHashV1.GetKeyedHashBytes( - asb, ekha, password, salt, GetPasswordHashV1.StretchCount); + return GetPasswordHashV1.GetKeyedHashBytes(asb, ekha, password, salt, GetPasswordHashV1.StretchCount); } - /// バイト配列のハッシュ値を計算して返す。 - /// バイト配列 - /// ハッシュ（キー付き）アルゴリズム列挙型 + /// Byte配列のHash値を計算して返す。 + /// Byte配列 + /// Keyed Hashアルゴリズム列挙型 /// 使用するパスワード - /// ソルト - /// ストレッチ回数 - /// ハッシュ値（バイト配列） + /// salt + /// Stretch回数 + /// Hash値（Byte配列） private static byte[] GetKeyedHashBytes(byte[] asb, EnumKeyedHashAlgorithm ekha, string password, byte[] salt, int stretchCount) + { + return GetPasswordHashV1.GetKeyedHashBytes(asb, ekha, password, salt, stretchCount, HashAlgorithmName.SHA256); + } + + /// Byte配列のHash値を計算して返す。 + /// Byte配列 + /// Keyed Hashアルゴリズム列挙型 + /// 使用するパスワード + /// salt + /// Stretch回数 + /// Hashアルゴリズム名（Stretching用） + /// Hash値（Byte配列） + private static byte[] GetKeyedHashBytes( + byte[] asb, EnumKeyedHashAlgorithm ekha, string password, byte[] salt, int stretchCount, HashAlgorithmName han) { // キーを生成する。 - Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(password, salt, stretchCount); + Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(password, salt, stretchCount, han); // HMACMD5 ：どのサイズのキーでも受け入れる ◯ // HMACRIPEMD160：どのサイズのキーでも受け入れる ◯ // HMACSHA1 ：どのサイズのキーでも受け入れる ◯ // HMACSHA256 ：どのサイズのキーでも受け入れる ◯ // HMACSHA384 ：どのサイズのキーでも受け入れる ◯ // HMACSHA512 ：どのサイズのキーでも受け入れる ◯ - // MACTripleDES ：長さが 16 または 24 バイトのキーを受け入れる + // MACTripleDES ：長さが 16 または 24 Byteのキーを受け入れる - // ハッシュ（キー付き）サービスプロバイダを生成 + // Keyed Hashサービスプロバイダを生成 #if NETSTD // NETSTDの場合の実装 @@ -328,7 +355,7 @@ private static byte[] GetKeyedHashBytes(byte[] asb, EnumKeyedHashAlgorithm ekha, passwordKey.GetBytes(24) // 上記より、24 決め打ちとする。 ); - // ハッシュ（キー付き）を生成して返す。 + // Keyed Hashを生成して返す。 byte[] temp = kha.ComputeHash(asb); kha.Clear(); // devps(1725) diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV2.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV2.cs index 9540eb25a..289d8daa6 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV2.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/Pwd/GetPasswordHashV2.cs @@ -20,7 +20,7 @@ //********************************************************************************** //* クラス名 ：GetPasswordHashV2 -//* クラス日本語名 ：Passwordハッシュを取得するクラス（v2 +//* クラス日本語名 ：Password Hashを取得するクラス（v2 //* //* 作成者 ：生技 西野 //* 更新履歴 ： @@ -31,11 +31,12 @@ //********************************************************************************** using System.Security.Cryptography; +using System.Text; using Touryo.Infrastructure.Public.Str; namespace Touryo.Infrastructure.Public.Security.Pwd { - /// Passwordハッシュを取得するクラス（v2 + /// Password Hashを取得するクラス（v2 public class GetPasswordHashV2 : GetKeyedHash { #region Hash @@ -45,8 +46,8 @@ public class GetPasswordHashV2 : GetKeyedHash /// Salted and hashed passwordとして保存する必要がある。 /// /// >Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 - /// ソルトの文字列長 + /// Hashアルゴリズム列挙型 + /// saltの文字列長 /// Salted and hashed password. /// public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha, int saltLength) @@ -60,13 +61,13 @@ public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha /// Salted and hashed passwordとして保存する必要がある。 /// /// >Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 - /// ソルトの文字列長 - /// ストレッチ回数 + /// Hashアルゴリズム列挙型 + /// saltの文字列長 + /// Stretch回数 /// Salted and hashed password. public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha, int saltLength, int stretchCount) { - // ランダム・ソルト文字列を生成（区切り記号は含まなくても良い） + // ランダムsalt文字列を生成（区切り記号は含まなくても良い） string salt = GetPassword.Generate(saltLength, 0); //Membership.GeneratePassword(saltLength, 0); // Salted and hashed password（文字列）を生成して返す。 @@ -79,14 +80,14 @@ public static string GetSaltedPassword(string rawPassword, EnumHashAlgorithm eha /// パスワードを比較して認証する。 /// Password entered by the user. /// Salted and hashed password. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// /// true：パスワードは一致した。 /// false：パスワードは一致しない。 /// public static bool EqualSaltedPassword(string rawPassword, string saltedPassword, EnumHashAlgorithm eha) { - // ソルト部分を取得 + // salt部分を取得 string[] temp = saltedPassword.Split('.'); string salt = CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[0]), CustomEncode.UTF_8); int stretchCount = int.Parse(CustomEncode.ByteToString(CustomEncode.FromBase64String(temp[1]), CustomEncode.UTF_8)); @@ -108,26 +109,54 @@ public static bool EqualSaltedPassword(string rawPassword, string saltedPassword #endregion #region KeyedHash - + /// /// Password entered by the userをDB保存する際、 /// Salted and hashed passwordとして保存する必要がある。 /// /// Password entered by the user. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// キー - /// ソルトの文字列長 - /// ストレッチ回数 + /// saltの文字列長 + /// Stretch回数 /// Salted and hashed password. public static string GetSaltedPassword(string rawPassword, EnumKeyedHashAlgorithm ekha, string key, int saltLength, int stretchCount) { - // ランダム・ソルト文字列を生成（区切り記号は含まなくても良い） + // overloadへ + return GetPasswordHashV2.GetSaltedPassword( + rawPassword, ekha, key, saltLength, stretchCount, HashAlgorithmName.SHA256); + } + + /// + /// Password entered by the userをDB保存する際、 + /// Salted and hashed passwordとして保存する必要がある。 + /// + /// Password entered by the user. + /// Hashアルゴリズム列挙型 + /// キー + /// saltの文字列長 + /// Stretch回数 + /// Hashアルゴリズム名 + /// Salted and hashed password. + public static string GetSaltedPassword(string rawPassword, + EnumKeyedHashAlgorithm ekha, string key, int saltLength, int stretchCount, HashAlgorithmName hashAlgorithmName) + { + // ランダムsalt文字列を生成（区切り記号は含まなくても良い） string salt = GetPassword.Generate(saltLength, 0); //Membership.GeneratePassword(saltLength, 0); byte[] saltByte = CustomEncode.StringToByte(salt, CustomEncode.UTF_8); // KeyedHashのキーを生成する。 - Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(key, saltByte, stretchCount); +#if NETSTD + var passwordKey = Rfc2898DeriveBytes.Pbkdf2( + password: Encoding.UTF8.GetBytes(key), + salt: saltByte, + iterations: stretchCount, + hashAlgorithm: hashAlgorithmName, + outputLength: 24); +#else + Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(key, saltByte, stretchCount, hashAlgorithmName); +#endif // Salted and hashed password（文字列）を生成して返す。 return @@ -141,24 +170,49 @@ public static string GetSaltedPassword(string rawPassword, // stretchCount + "." + CustomEncode.ToBase64String(CustomEncode.StringToByte(stretchCount.ToString(), CustomEncode.UTF_8)) +#if NETSTD + // Salted and hashed password + + "." + CustomEncode.ToBase64String( + GetPasswordHashV2.GetKeyedHashBytes( + CustomEncode.StringToByte(salt + rawPassword, CustomEncode.UTF_8), + ekha, passwordKey)); +#else // Salted and hashed password + "." + CustomEncode.ToBase64String( GetPasswordHashV2.GetKeyedHashBytes( CustomEncode.StringToByte(salt + rawPassword, CustomEncode.UTF_8), ekha, passwordKey.GetBytes(24))); +#endif + } /// パスワードを比較して認証する。 /// Password entered by the user. /// Salted and hashed password. - /// ハッシュ・アルゴリズム列挙型 + /// Hashアルゴリズム列挙型 /// /// true：パスワードは一致した。 /// false：パスワードは一致しない。 /// public static bool EqualSaltedPassword(string rawPassword, string saltedPassword, EnumKeyedHashAlgorithm ekha) { - // ソルト部分を取得 + // overloadへ + return EqualSaltedPassword(rawPassword, saltedPassword, ekha, HashAlgorithmName.SHA256); + } + + /// パスワードを比較して認証する。 + /// Password entered by the user. + /// Salted and hashed password. + /// Hashアルゴリズム列挙型 + /// Hashアルゴリズム名 + /// + /// true：パスワードは一致した。 + /// false：パスワードは一致しない。 + /// + public static bool EqualSaltedPassword( + string rawPassword, string saltedPassword, EnumKeyedHashAlgorithm ekha, HashAlgorithmName hashAlgorithmName) + { + // salt部分を取得 string[] temp = saltedPassword.Split('.'); // key @@ -177,13 +231,28 @@ public static bool EqualSaltedPassword(string rawPassword, string saltedPassword string hashedPassword = temp[3]; // KeyedHashのキーを生成する。 - Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(key, saltByte, stretchCount); +#if NETSTD + var passwordKey = Rfc2898DeriveBytes.Pbkdf2( + password: Encoding.UTF8.GetBytes(key), + salt: saltByte, + iterations: stretchCount, + hashAlgorithm: hashAlgorithmName, + outputLength: 24); + + // 引数のsaltedPasswordと、rawPasswordから自作したsaltedPasswordを比較 + string compare = CustomEncode.ToBase64String( + GetPasswordHashV2.GetKeyedHashBytes( + CustomEncode.StringToByte(salt + rawPassword, CustomEncode.UTF_8), + ekha, passwordKey)); +#else + Rfc2898DeriveBytes passwordKey = new Rfc2898DeriveBytes(key, saltByte, stretchCount, hashAlgorithmName); // 引数のsaltedPasswordと、rawPasswordから自作したsaltedPasswordを比較 string compare = CustomEncode.ToBase64String( GetPasswordHashV2.GetKeyedHashBytes( CustomEncode.StringToByte(salt + rawPassword, CustomEncode.UTF_8), ekha, passwordKey.GetBytes(24))); +#endif if (hashedPassword == compare) { diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Security/SymmetricCryptography.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Security/SymmetricCryptography.cs index ac6eec85f..2942cfca1 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Security/SymmetricCryptography.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Security/SymmetricCryptography.cs @@ -44,6 +44,7 @@ //********************************************************************************** using System; +using System.Text; using System.Security.Cryptography; using Touryo.Infrastructure.Public.Str; @@ -78,7 +79,7 @@ public class SymmetricCryptography /// Constructor public SymmetricCryptography() : - this(EnumSymmetricAlgorithm.AES_M) {　} + this(EnumSymmetricAlgorithm.AES) { } /// Constructor /// 対称アルゴリズム @@ -198,18 +199,52 @@ public byte[] DecryptBytes(byte[] source, string password) /// ストレッチング private void GenerateKeyFromPassword(string password, int keySize, out byte[] key, int blockSize, out byte[] iv, byte[] salt, int stretching) + { + // overloadへ + this.GenerateKeyFromPassword(password, keySize, out key, blockSize, out iv, salt, stretching); + } + + /// パスワードから共有キーと初期化ベクタを生成する + /// 基になるパスワード + /// 共有キーのサイズ（ビット） + /// 作成された共有キー + /// 初期化ベクタのサイズ（ビット） + /// 作成された初期化ベクタ + /// ソルト + /// ストレッチング + /// Hashアルゴリズム名 + private void GenerateKeyFromPassword(string password, + int keySize, out byte[] key, int blockSize, out byte[] iv, byte[] salt, int stretching, HashAlgorithmName hashAlgorithmName) { //パスワードから共有キーと初期化ベクタを作成する + ////.NET Framework 1.1以下の時は、PasswordDeriveBytesを使用する + ////PasswordDeriveBytes deriveBytes = new PasswordDeriveBytes(password, salt); + +#if NETSTD + // 共有キーを生成 + key = Rfc2898DeriveBytes.Pbkdf2( + password: Encoding.UTF8.GetBytes(password), + salt: salt, + iterations: stretching, + hashAlgorithm: hashAlgorithmName, + outputLength: keySize / 8); + + // 初期化ベクタを生成 + iv = Rfc2898DeriveBytes.Pbkdf2( + password: Encoding.UTF8.GetBytes(password), + salt: salt, + iterations: stretching, + hashAlgorithm: hashAlgorithmName, + outputLength: blockSize / 8); +#else //Rfc2898DeriveBytesオブジェクトを作成する - Rfc2898DeriveBytes deriveBytes = new Rfc2898DeriveBytes(password, salt, stretching); + Rfc2898DeriveBytes deriveBytes = new Rfc2898DeriveBytes(password, salt, stretching, hashAlgorithmName); - //.NET Framework 1.1以下の時は、PasswordDeriveBytesを使用する - //PasswordDeriveBytes deriveBytes = new PasswordDeriveBytes(password, salt); - //共有キーと初期化ベクタを生成する key = deriveBytes.GetBytes(keySize / 8); iv = deriveBytes.GetBytes(blockSize / 8); +#endif } /// @@ -292,61 +327,63 @@ private SymmetricAlgorithm CreateSymmetricAlgorithm(EnumSymmetricAlgorithm esa, SymmetricAlgorithm sa = null; #region Aes - if (esa.HasFlag(EnumSymmetricAlgorithm.AES_CSP)) + if (esa.HasFlag(EnumSymmetricAlgorithm.AES)) + { + // Aes + sa = Aes.Create(); // devps(1703) + } + /* PF依存排除 + else if (esa.HasFlag(EnumSymmetricAlgorithm.AES_CSP)) { - // AesCryptoServiceProviderサービスプロバイダ + // AesCryptoServiceProvider sa = AesCryptoServiceProvider.Create(); // devps(1703) } else if (esa.HasFlag(EnumSymmetricAlgorithm.AES_M)) { - // AesManagedサービスプロバイダ + // AesManaged sa = AesManaged.Create(); // devps(1703) - } -#if NET45 || NET46 -#else + }*/ else if (esa.HasFlag(EnumSymmetricAlgorithm.AES_CNG)) { - // AesCngサービスプロバイダ + // AesCng sa = AesCng.Create(); // devps(1703) } -#endif #endregion #region TripleDES - else if (esa.HasFlag(EnumSymmetricAlgorithm.TDES_CSP)) + else if (esa.HasFlag(EnumSymmetricAlgorithm.TDES))//_CSP)) { - // TripleDESCryptoServiceProviderサービスプロバイダ - sa = TripleDESCryptoServiceProvider.Create(); // devps(1703) + // TripleDES PF依存排除 + sa = TripleDES.Create();//TripleDESCryptoServiceProvider.Create(); // devps(1703) } -#if NET45 || NET46 -#else else if (esa.HasFlag(EnumSymmetricAlgorithm.TDES_CNG)) { - // TripleDESCngサービスプロバイダ + // TripleDESCng sa = TripleDESCng.Create(); // devps(1703) } -#endif + #endregion #region Others - else if (esa.HasFlag(EnumSymmetricAlgorithm.DES_CSP)) + else if (esa.HasFlag(EnumSymmetricAlgorithm.DES))//_CSP)) { - // DESCryptoServiceProviderサービスプロバイダ - sa = DESCryptoServiceProvider.Create(); // devps(1703) + // DES PF依存排除 + sa = DES.Create();//DESCryptoServiceProvider.Create(); // devps(1703) } - else if (esa.HasFlag(EnumSymmetricAlgorithm.RC2_CSP)) + else if (esa.HasFlag(EnumSymmetricAlgorithm.RC2))//_CSP)) { - // RC2CryptoServiceProviderサービスプロバイダ - sa = RC2CryptoServiceProvider.Create(); // devps(1703) + // RC2 PF依存排除 + sa = RC2.Create();//RC2CryptoServiceProvider.Create(); // devps(1703) } - + /* PF依存 & 旧規格 else if (esa.HasFlag(EnumSymmetricAlgorithm.Rijndael_M)) { // RijndaelManagedサービスプロバイダ sa = RijndaelManaged.Create(); // devps(1703) } + */ #endregion else diff --git a/root/programs/CS/Frameworks/Infrastructure/Public/Util/RandomValueGenerator.cs b/root/programs/CS/Frameworks/Infrastructure/Public/Util/RandomValueGenerator.cs index d9ef792f3..6f71d738e 100644 --- a/root/programs/CS/Frameworks/Infrastructure/Public/Util/RandomValueGenerator.cs +++ b/root/programs/CS/Frameworks/Infrastructure/Public/Util/RandomValueGenerator.cs @@ -82,9 +82,15 @@ public static bool TrueOrFalse() public static uint GenerateRandomUint() { byte[] bs = new byte[sizeof(uint)]; + +#if NETCOREAPP + RandomNumberGenerator.Fill(bs); +#else RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider(); rng.GetBytes(bs); rng.Dispose(); +#endif + return BitConverter.ToUInt32(bs, 0); } } diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln index da53c569b..a716a1f64 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/ASPNETWebService/ASPNETWebService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASPNETWebService", "ASPNETWebService.csproj", "{31B8CFB3-33AA-4528-AA5F-A1888A73977B}" EndProject diff --git a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln index c8e71d94b..1dd3fff1b 100644 --- a/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln +++ b/root/programs/CS/Frameworks/Infrastructure/ServiceInterface/WCFService/WCFService.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCFService", "WCFService.csproj", "{096A202A-72E4-41D8-8B61-970E48E38135}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtil/EncAndDecUtil48.sln b/root/programs/CS/Frameworks/Tests/EncAndDecUtil/EncAndDecUtil48.sln index 981001dc4..4d5b8155d 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtil/EncAndDecUtil48.sln +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtil/EncAndDecUtil48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncAndDecUtil", "net48\EncAndDecUtil.csproj", "{F236461D-1C61-46D7-BBCE-B96E63CE31DD}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtil/Form1.cs b/root/programs/CS/Frameworks/Tests/EncAndDecUtil/Form1.cs index f79e02bdd..a88061575 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtil/Form1.cs +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtil/Form1.cs @@ -574,11 +574,11 @@ private void btnDSSign_Click(object sender, EventArgs e) EnumDigitalSignAlgorithm edsa = (EnumDigitalSignAlgorithm)this.cbxDSPV.SelectedValue; - if (edsa == EnumDigitalSignAlgorithm.RsaCSP_MD5 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA1 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA256 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA384 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA512 + if (edsa == EnumDigitalSignAlgorithm.Rsa_MD5 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA1 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA256 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA384 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA512 || edsa == EnumDigitalSignAlgorithm.DsaCSP_SHA1) { if (rbnDSXML.Checked) @@ -671,11 +671,11 @@ private void btnDSVerify_Click(object sender, EventArgs e) EnumDigitalSignAlgorithm edsa = (EnumDigitalSignAlgorithm)this.cbxDSPV.SelectedValue; - if (edsa == EnumDigitalSignAlgorithm.RsaCSP_MD5 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA1 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA256 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA384 - || edsa == EnumDigitalSignAlgorithm.RsaCSP_SHA512 + if (edsa == EnumDigitalSignAlgorithm.Rsa_MD5 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA1 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA256 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA384 + || edsa == EnumDigitalSignAlgorithm.Rsa_SHA512 || edsa == EnumDigitalSignAlgorithm.DsaCSP_SHA1) { if (rbnDSXML.Checked) diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore80.sln b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore100.sln similarity index 85% rename from root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore80.sln rename to root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore100.sln index 85b74ce54..17cd6a001 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore80.sln +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUICore100.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncAndDecUtilCUI", "core80\EncAndDecUtilCUICore.csproj", "{E6B7D6EE-D395-4776-ADA5-5DD0968059D8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncAndDecUtilCUICore", "core100\EncAndDecUtilCUICore.csproj", "{E6B7D6EE-D395-4776-ADA5-5DD0968059D8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUIFx48.sln b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUIFx48.sln index 63f52e291..ec877b693 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUIFx48.sln +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/EncAndDecUtilCUIFx48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EncAndDecUtilCUIFx", "net48\EncAndDecUtilCUIFx.csproj", "{7DAC4701-A800-4C8A-B70F-2A71C78F7B2F}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Program.cs b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Program.cs index aee472b9b..d2cdbbd09 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Program.cs +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Program.cs @@ -22,7 +22,7 @@ using Touryo.Infrastructure.Public.Security.KeyExg; using Touryo.Infrastructure.Public.Security.Pwd; using Touryo.Infrastructure.Public.Security.Xml; -using Touryo.Infrastructure.Public.Diagnostics; +using TIPD = Touryo.Infrastructure.Public.Diagnostics; namespace EncAndDecUtilCUI { @@ -73,14 +73,12 @@ public static void Main(string[] args) Program.Hash(); Program.KeyedHash(); Program.PasswordHash(); - - MyDebug.OutputDebugAndConsole("----------------------------------------------------------------------------------------------------"); + TIPD.MyDebug.OutputDebugAndConsole("----------------------------------------------------------------------------------------------------"); // Cryptography Program.PrivateKeyCryptography(); Program.PublicKeyCryptography(); - - MyDebug.OutputDebugAndConsole("----------------------------------------------------------------------------------------------------"); + TIPD.MyDebug.OutputDebugAndConsole("----------------------------------------------------------------------------------------------------"); // Jwt(Jws, Jwe) Program.MyJwt(); @@ -100,7 +98,7 @@ public static void Main(string[] args) } catch (Exception ex) { - MyDebug.OutputDebugAndConsole(ex.ToString()); + TIPD.MyDebug.OutputDebugAndConsole(ex.ToString()); } } @@ -115,33 +113,29 @@ private static void Hash() #region Managed or CSP // Default - MyDebug.OutputDebugAndConsole("HashAlgorithm.Default", GetHash.GetHashString(data, EnumHashAlgorithm.Default)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.Default", GetHash.GetHashString(data, EnumHashAlgorithm.Default)); // MD5 - MyDebug.OutputDebugAndConsole("HashAlgorithm.MD5_CSP", GetHash.GetHashString(data, EnumHashAlgorithm.MD5_CSP)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.MD5", GetHash.GetHashString(data, EnumHashAlgorithm.MD5)); // RIPEMD160 - MyDebug.OutputDebugAndConsole("HashAlgorithm.RIPEMD160_M", GetHash.GetHashString(data, EnumHashAlgorithm.RIPEMD160_M)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.RIPEMD160_M", GetHash.GetHashString(data, EnumHashAlgorithm.RIPEMD160_M)); // SHA1 - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA1_CSP", GetHash.GetHashString(data, EnumHashAlgorithm.SHA1_CSP)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA1_M", GetHash.GetHashString(data, EnumHashAlgorithm.SHA1_M)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA1", GetHash.GetHashString(data, EnumHashAlgorithm.SHA1)); // SHA256 - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA256_CSP", GetHash.GetHashString(data, EnumHashAlgorithm.SHA256_CSP)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA256_M", GetHash.GetHashString(data, EnumHashAlgorithm.SHA256_M)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA256", GetHash.GetHashString(data, EnumHashAlgorithm.SHA256)); // SHA384 - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA384_CSP", GetHash.GetHashString(data, EnumHashAlgorithm.SHA384_CSP)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA384_M", GetHash.GetHashString(data, EnumHashAlgorithm.SHA384_M)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA384", GetHash.GetHashString(data, EnumHashAlgorithm.SHA384)); // SHA512 - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA512_CSP", GetHash.GetHashString(data, EnumHashAlgorithm.SHA512_CSP)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA512_M", GetHash.GetHashString(data, EnumHashAlgorithm.SHA512_M)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA512", GetHash.GetHashString(data, EnumHashAlgorithm.SHA512)); #endregion #if NETCOREAPP #else #region CNG - MyDebug.OutputDebugAndConsole("HashAlgorithm.MD5_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.MD5_CNG)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA1_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA1_CNG)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA256_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA256_CNG)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA384_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA384_CNG)); - MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA512_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA512_CNG)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.MD5_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.MD5_CNG)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA1_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA1_CNG)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA256_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA256_CNG)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA384_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA384_CNG)); + TIPD.MyDebug.OutputDebugAndConsole("HashAlgorithm.SHA512_CNG", GetHash.GetHashString(data, EnumHashAlgorithm.SHA512_CNG)); #endregion #endif } @@ -152,14 +146,14 @@ private static void KeyedHash() string data = "ynyKeiR9FXWPkNQHvUPZkAlfUmouExBv"; string key = "ynyKeiR9FXWPkNQHvUPZkAlfUmouExBv"; - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.Default", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.Default, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACMD5", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACMD5, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACRIPEMD160", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACRIPEMD160, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA1", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA1, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA256", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA256, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA384", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA384, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA512", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA512, key)); - MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.MACTripleDES", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.MACTripleDES, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.Default", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.Default, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACMD5", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACMD5, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACRIPEMD160", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACRIPEMD160, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA1", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA1, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA256", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA256, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA384", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA384, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.HMACSHA512", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.HMACSHA512, key)); + TIPD.MyDebug.OutputDebugAndConsole("KeyedHashAlgorithm.MACTripleDES", GetKeyedHash.GetKeyedHashString(data, EnumKeyedHashAlgorithm.MACTripleDES, key)); } /// PasswordHash @@ -176,17 +170,21 @@ private static void PasswordHash() hashedPassword = "$1$.JU5JJFZXQVIqWQ==.Rkg3YW5WVWt4YQ==.MTAwMA==.ODU0MXJPRWJmVzA9"; key = "%NI$VWAR*Y"; +#pragma warning disable 618 // 下位互換の確認 ret = GetPasswordHashV1.EqualSaltedPassword( providedPassword, hashedPassword.Substring(4), - EnumKeyedHashAlgorithm.MACTripleDES); - MyDebug.OutputDebugAndConsole("GetPasswordHashV1.EqualSaltedPassword (old)", ret.ToString()); + EnumKeyedHashAlgorithm.MACTripleDES, HashAlgorithmName.SHA1); +#pragma warning restore 618 + + TIPD.MyDebug.OutputDebugAndConsole("GetPasswordHashV1.EqualSaltedPassword (old)", ret.ToString()); ret = GetPasswordHashV2.EqualSaltedPassword( providedPassword, hashedPassword.Substring(4), - EnumKeyedHashAlgorithm.MACTripleDES); - MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (old)", ret.ToString()); + EnumKeyedHashAlgorithm.MACTripleDES, HashAlgorithmName.SHA1); + + TIPD.MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (old)", ret.ToString()); #endregion #region 可逆性確認 @@ -204,7 +202,7 @@ private static void PasswordHash() hashedPassword, EnumKeyedHashAlgorithm.MACTripleDES); - MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (new)", ret.ToString()); + TIPD.MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (new)", ret.ToString()); // HMACSHA512 hashedPassword = GetPasswordHashV2.GetSaltedPassword( @@ -220,7 +218,7 @@ private static void PasswordHash() hashedPassword, EnumKeyedHashAlgorithm.HMACSHA512); - MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (new)", ret.ToString()); + TIPD.MyDebug.OutputDebugAndConsole("GetPasswordHashV2.EqualSaltedPassword (new)", ret.ToString()); #endregion } @@ -278,40 +276,62 @@ private static void PublicKeyCryptography() #region Test of the X.509 Certificates #region RSA +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicRsaX509Path); +#else privateX509Key = new X509Certificate2(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); publicX509Key = new X509Certificate2(Program.PublicRsaX509Path, "", x509KSF); +#endif + + + Touryo.Infrastructure.Public.Security. MyDebug.InspectPrivateX509Key("RSA", privateX509Key); + Touryo.Infrastructure.Public.Security. MyDebug.InspectPublicX509Key("RSA", publicX509Key); #endregion -#if NETCOREAPP || NET47 #region DSA // https://github.com/dotnet/corefx/issues/18733#issuecomment-296723615 - +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateDsaX509Path, Program.PfxPassword); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicDsaX509Path); +#else privateX509Key = new X509Certificate2(Program.PrivateDsaX509Path, Program.PfxPassword); publicX509Key = new X509Certificate2(Program.PublicDsaX509Path, ""); +#endif + + Touryo.Infrastructure.Public.Security. MyDebug.InspectPrivateX509Key("DSA", privateX509Key); + Touryo.Infrastructure.Public.Security. MyDebug.InspectPublicX509Key("DSA", publicX509Key); DSA privateDSA = privateX509Key.GetDSAPrivateKey(); - MyDebug.OutputDebugAndConsole("privateDSA", (privateDSA == null ? "is null" : "is not null")); + TIPD.MyDebug.OutputDebugAndConsole("privateDSA", (privateDSA == null ? "is null" : "is not null")); //DSA publicDSA = null; // publicX509Key.GetDSAPublicKey(); // Internal.Cryptography.CryptoThrowHelper.WindowsCryptographicException #endregion #region ECDsa // https://github.com/dotnet/corefx/issues/18733#issuecomment-296723615 +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateECDsaX509_256Path, Program.PfxPassword); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicECDsaX509_256Path); +#else privateX509Key = new X509Certificate2(Program.PrivateECDsaX509_256Path, Program.PfxPassword); publicX509Key = new X509Certificate2(Program.PublicECDsaX509_256Path, ""); +#endif + + Touryo.Infrastructure.Public.Security. MyDebug.InspectPrivateX509Key("ECDsa", privateX509Key); + Touryo.Infrastructure.Public.Security. MyDebug.InspectPublicX509Key("ECDsa", publicX509Key); ECDsa privateECDsa = privateX509Key.GetECDsaPrivateKey(); - MyDebug.OutputDebugAndConsole("privateECDsa", (privateECDsa == null ? "is null" : "is not null")); + TIPD.MyDebug.OutputDebugAndConsole("privateECDsa", (privateECDsa == null ? "is null" : "is not null")); ECDsa publicECDsa = publicX509Key.GetECDsaPublicKey(); - MyDebug.OutputDebugAndConsole("publicECDsa", (publicECDsa == null ? "is null" : "is not null")); + TIPD.MyDebug.OutputDebugAndConsole("publicECDsa", (publicECDsa == null ? "is null" : "is not null")); #endregion -#endif #endregion @@ -327,7 +347,7 @@ private static void PublicKeyCryptography() temp = ascPrivate.DecryptString(temp); - MyDebug.OutputDebugAndConsole("ASymCrypt(X509).Enc&Dec", (temp == moji).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("ASymCrypt(X509).Enc&Dec", (temp == moji).ToString()); #endregion @@ -339,10 +359,8 @@ private static void PublicKeyCryptography() DigitalSignXML dsXML = null; // ECDsa -#if NETCOREAPP || NET47 DigitalSignECDsaX509 dsECDsaX509 = null; DigitalSignECDsaCng dsECDsaCng = null; -#endif #if NETCOREAPP DigitalSignECDsaOpenSsl dsECDsaOpenSsl = null; #endif @@ -355,24 +373,26 @@ private static void PublicKeyCryptography() sign = dsX509.Sign(data); dsX509 = new DigitalSignX509(Program.PublicRsaX509Path, "", "SHA256", x509KSF); - MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(RS256)", dsX509.Verify(data, sign).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(RS256)", dsX509.Verify(data, sign).ToString()); // Param - dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.RsaCSP_SHA256); + dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.Rsa_SHA256); sign = dsParam.Sign(data); - dsParam = new DigitalSignParam((RSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.RsaCSP_SHA256); - MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(RS256)", dsParam.Verify(data, sign).ToString()); + dsParam = new DigitalSignParam((RSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.Rsa_SHA256); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(RS256)", dsParam.Verify(data, sign).ToString()); // XML - dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.RsaCSP_SHA256); + dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.Rsa_SHA256); sign = dsXML.Sign(data); #if !NETCOREAPP // NETCOREでは、XML鍵のExportが動かない。 - dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.RsaCSP_SHA256); + dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.Rsa_SHA256); #endif - MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(RS256)", dsXML.Verify(data, sign).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(RS256)", dsXML.Verify(data, sign).ToString()); #endregion #region DSA @@ -387,7 +407,8 @@ private static void PublicKeyCryptography() sign = dsParam.SignByFormatter(data); dsParam = new DigitalSignParam((DSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.DsaCSP_SHA1); - MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(DSA-SHA1)", dsParam.VerifyByDeformatter(data, sign).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(DSA-SHA1)", dsParam.VerifyByDeformatter(data, sign).ToString()); // XML dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.DsaCSP_SHA1); @@ -397,50 +418,45 @@ private static void PublicKeyCryptography() // NETCOREでは、XML鍵のExportが動かない。 dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.DsaCSP_SHA1); #endif - - MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(DSA-SHA1)", dsXML.VerifyByDeformatter(data, sign).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(DSA-SHA1)", dsXML.VerifyByDeformatter(data, sign).ToString()); #endregion #region ECDsa + #region 256 -#if NETCOREAPP || NET47 // X509 dsECDsaX509 = new DigitalSignECDsaX509(Program.PrivateECDsaX509_256Path, Program.PfxPassword, HashAlgorithmName.SHA256); sign = dsECDsaX509.Sign(data); dsECDsaX509 = new DigitalSignECDsaX509(Program.PublicECDsaX509_256Path, "", HashAlgorithmName.SHA256); - MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA-SHA256)", dsECDsaX509.Verify(data, sign).ToString()); -#if NET47 || NETCOREAPP3_0 + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA-SHA256)", dsECDsaX509.Verify(data, sign).ToString()); + // Param dsECDsaCng = new DigitalSignECDsaCng(EnumDigitalSignAlgorithm.ECDsaCng_P256); sign = dsECDsaCng.Sign(data); dsECDsaCng = new DigitalSignECDsaCng(dsECDsaCng.PublicKey); MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(ECDSA-P256)", dsECDsaCng.Verify(data, sign).ToString()); -#endif -#endif #endregion #region 512 -#if NETCOREAPP || NET47 // X509 dsECDsaX509 = new DigitalSignECDsaX509(Program.PrivateECDsaX509_256Path, Program.PfxPassword, HashAlgorithmName.SHA512); sign = dsECDsaX509.Sign(data); dsECDsaX509 = new DigitalSignECDsaX509(Program.PublicECDsaX509_256Path, "", HashAlgorithmName.SHA512); - MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA-SHA512)", dsECDsaX509.Verify(data, sign).ToString()); -#if NET47 || NETCOREAPP3_0 + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA-SHA512)", dsECDsaX509.Verify(data, sign).ToString()); + // Param dsECDsaCng = new DigitalSignECDsaCng(EnumDigitalSignAlgorithm.ECDsaCng_P521); sign = dsECDsaCng.Sign(data); dsECDsaCng = new DigitalSignECDsaCng(dsECDsaCng.PublicKey); MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(ECDSA-P521)", dsECDsaCng.Verify(data, sign).ToString()); -#endif -#endif #endregion + #endregion } else //if (os.Platform == PlatformID.Unix) @@ -452,21 +468,23 @@ private static void PublicKeyCryptography() sign = dsX509.Sign(data); dsX509 = new DigitalSignX509(Program.PublicRsaX509Path, "", "SHA256"); - MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(RS256)", dsX509.Verify(data, sign).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(RS256)", dsX509.Verify(data, sign).ToString()); // Param - dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256); + dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.Rsa_SHA256); sign = dsParam.Sign(data); - dsParam = new DigitalSignParam((RSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256); - MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(RS256)", dsParam.Verify(data, sign).ToString()); + dsParam = new DigitalSignParam((RSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.Rsa_SHA256); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(RS256)", dsParam.Verify(data, sign).ToString()); // XML - dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256); + dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.Rsa_SHA256); sign = dsXML.Sign(data); //dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.RsaOpenSsl_SHA256); // 動かない - MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(RS256)", dsXML.Verify(data, sign).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(RS256)", dsXML.Verify(data, sign).ToString()); #endregion #region DSA @@ -475,21 +493,24 @@ private static void PublicKeyCryptography() sign = dsX509.Sign(data); dsX509 = new DigitalSignX509(Program.PublicDsaX509Path, "", "SHA256"); - MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(DSA-SHA256)", dsX509.Verify(data, sign).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignX509.Verify(DSA-SHA256)", dsX509.Verify(data, sign).ToString()); // Param - dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.DsaOpenSsl_SHA1); + dsParam = new DigitalSignParam(EnumDigitalSignAlgorithm.DsaOpenSsl_SHA256); sign = dsParam.Sign(data); - dsParam = new DigitalSignParam((DSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.DsaOpenSsl_SHA1); - MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(DSA-SHA1)", dsParam.Verify(data, sign).ToString()); + dsParam = new DigitalSignParam((DSAParameters)dsParam.PublicKey, EnumDigitalSignAlgorithm.DsaOpenSsl_SHA256); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(DSA-SHA256)", dsParam.Verify(data, sign).ToString()); // XML - dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.DsaOpenSsl_SHA1); + dsXML = new DigitalSignXML(EnumDigitalSignAlgorithm.DsaOpenSsl_SHA256); sign = dsXML.Sign(data); - //dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.DsaOpenSsl_SHA1); // 動かない - MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(DSA-SHA1)", dsXML.Verify(data, sign).ToString()); + //dsXML = new DigitalSignXML(dsXML.PublicKey, EnumDigitalSignAlgorithm.DsaOpenSsl_SHA256); // 動かない + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignXML.Verify(DSA-SHA256)", dsXML.Verify(data, sign).ToString()); #endregion #region ECDsa (.NET Core on Linux) @@ -498,16 +519,16 @@ private static void PublicKeyCryptography() sign = dsECDsaX509.Sign(data); dsECDsaX509 = new DigitalSignECDsaX509(Program.PublicECDsaX509_256Path, "", HashAlgorithmName.SHA256); - MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA)", dsECDsaX509.Verify(data, sign).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignECDsaX509.Verify(ECDSA)", dsECDsaX509.Verify(data, sign).ToString()); // Param - dsECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - EnumDigitalSignAlgorithm.ECDsaOpenSsl_P256, SHA256CryptoServiceProvider.Create()); + dsECDsaOpenSsl = new DigitalSignECDsaOpenSsl(EnumDigitalSignAlgorithm.ECDsaOpenSsl_P256, SHA256.Create()); sign = dsECDsaOpenSsl.Sign(data); - dsECDsaOpenSsl = new DigitalSignECDsaOpenSsl( - dsECDsaOpenSsl.PublicKey.Value, SHA256CryptoServiceProvider.Create()); - MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(ECDSA-P256)", dsParam.Verify(data, sign).ToString()); + dsECDsaOpenSsl = new DigitalSignECDsaOpenSsl(dsECDsaOpenSsl.PublicKey.Value, SHA256.Create()); + + TIPD.MyDebug.OutputDebugAndConsole("DigitalSignParam.Verify(ECDSA-P256)", dsParam.Verify(data, sign).ToString()); #endregion #endif } @@ -564,9 +585,8 @@ private static void MyJwt() byte[] key = null; string jwk = ""; RsaPublicKeyConverter rpkc = null; -#if NETCOREAPP || NET47 EccPublicKeyConverter epkc = null; -#endif + #endregion #region Jws @@ -582,7 +602,6 @@ private static void MyJwt() JWS_RS512_X509 jWS_RS512_X509 = null; JWS_RS512_Param jWS_RS512_Param = null; -#if NETCOREAPP || NET47 // ES256 JWS_ES256_X509 jWS_ES256_X509 = null; JWS_ES256_Param jWS_ES256_Param = null; @@ -594,7 +613,7 @@ private static void MyJwt() // ES512 JWS_ES512_X509 jWS_ES512_X509 = null; JWS_ES512_Param jWS_ES512_Param = null; -#endif + #endregion #region Jwe @@ -612,26 +631,33 @@ private static void MyJwt() // HS256 署名・検証 JWS_HS256 jWS_HS256 = new JWS_HS256(key); token = jWS_HS256.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_HS256.Create", token); - MyDebug.OutputDebugAndConsole("JWS_HS256.Verify", jWS_HS256.Verify(token).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("JWS_HS256.Verify", jWS_HS256.Verify(token).ToString()); // HS384 署名・検証 JWS_HS384 jWS_HS384 = new JWS_HS384(key); token = jWS_HS384.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_HS384.Create", token); - MyDebug.OutputDebugAndConsole("JWS_HS384.Verify", jWS_HS384.Verify(token).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("JWS_HS384.Verify", jWS_HS384.Verify(token).ToString()); // HS512 署名・検証 JWS_HS512 jWS_HS512 = new JWS_HS512(key); token = jWS_HS512.Create(payloadString); - MyDebug.InspectJwt("JWS_HS512.Create", token); - MyDebug.OutputDebugAndConsole("JWS_HS512.Verify", jWS_HS512.Verify(token).ToString()); + + Touryo.Infrastructure.Public.Security.MyDebug.InspectJwt("JWS_HS512.Create", token); + TIPD.MyDebug.OutputDebugAndConsole("JWS_HS512.Verify", jWS_HS512.Verify(token).ToString()); // JWKを使用 jWS_HS512 = new JWS_HS512(jWS_HS512.JWK); token = jWS_HS512.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_HS512.Create with JWK", token); - MyDebug.OutputDebugAndConsole("JWS_HS512.Verify with JWK", jWS_HS512.Verify(token).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("JWS_HS512.Verify with JWK", jWS_HS512.Verify(token).ToString()); #endregion #region RSA(RS) @@ -640,74 +666,87 @@ private static void MyJwt() // 署名（X509） jWS_RS256_X509 = new JWS_RS256_X509(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); token = jWS_RS256_X509.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_RS256_X509.Create", token); // 鍵の相互変換 rpkc = new RsaPublicKeyConverter(JWS_RSA.RS._256); jwk = rpkc.ParamToJwk(((RSA)jWS_RS256_X509.DigitalSignX509.AsymmetricAlgorithm).ExportParameters(false)); - MyDebug.OutputDebugAndConsole("RSA JWK", jwk); + + TIPD.MyDebug.OutputDebugAndConsole("RSA JWK", jwk); // 検証（X509） jWS_RS256_X509 = new JWS_RS256_X509(Program.PublicRsaX509Path, "", x509KSF); - MyDebug.OutputDebugAndConsole("JWS_RS256_X509.Verify", jWS_RS256_X509.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS256_X509.Verify", jWS_RS256_X509.Verify(token).ToString()); // 検証（Param） jWS_RS256_Param = new JWS_RS256_Param(rpkc.JwkToParam(jwk)); - MyDebug.OutputDebugAndConsole("JWS_RS256_Param.Verify", jWS_RS256_Param.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS256_Param.Verify", jWS_RS256_Param.Verify(token).ToString()); #endregion -#if NETCOREAPP -#else + #region 384 // 署名（XML） jWS_RS384_XML = new JWS_RS384_XML(); token = jWS_RS384_XML.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("jWS_RS384_XML.Create", token); // 鍵の相互変換 rpkc = new RsaPublicKeyConverter(JWS_RSA.RS._384); jwk = rpkc.XmlToJwk(jWS_RS384_XML.XMLPrivateKey); - MyDebug.OutputDebugAndConsole("RSA JWK", jwk); + + TIPD.MyDebug.OutputDebugAndConsole("RSA JWK", jwk); // 検証（XML） //jWS_RS384_XML = new JWS_RS384_XML(jWS_RS384_XML.XMLPrivateKey); - MyDebug.OutputDebugAndConsole("JWS_RS384_XML.Verify", jWS_RS384_XML.Verify(token).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS384_XML.Verify", jWS_RS384_XML.Verify(token).ToString()); // 検証（Param） jWS_RS384_Param = new JWS_RS384_Param(rpkc.JwkToParam(jwk)); - MyDebug.OutputDebugAndConsole("JWS_RS384_Param.Verify", jWS_RS384_Param.Verify(token).ToString()); + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS384_Param.Verify", jWS_RS384_Param.Verify(token).ToString()); #endregion #region 512 // 署名（X509） jWS_RS512_X509 = new JWS_RS512_X509(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); token = jWS_RS512_X509.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_RS512_X509.Create", token); // 鍵の相互変換 rpkc = new RsaPublicKeyConverter(JWS_RSA.RS._512); jwk = rpkc.ParamToJwk(((RSA)jWS_RS512_X509.DigitalSignX509.AsymmetricAlgorithm).ExportParameters(false)); - MyDebug.OutputDebugAndConsole("RSA JWK", jwk); + + TIPD.MyDebug.OutputDebugAndConsole("RSA JWK", jwk); // 検証（X509） jWS_RS512_X509 = new JWS_RS512_X509(Program.PublicRsaX509Path, "", x509KSF); - MyDebug.OutputDebugAndConsole("JWS_RS512_X509.Verify", jWS_RS512_X509.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS512_X509.Verify", jWS_RS512_X509.Verify(token).ToString()); // 検証（Param） jWS_RS512_Param = new JWS_RS512_Param(rpkc.JwkToParam(jwk)); - MyDebug.OutputDebugAndConsole("JWS_RS512_Param.Verify", jWS_RS512_Param.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS512_Param.Verify", jWS_RS512_Param.Verify(token).ToString()); #endregion -#endif + #endregion // DSA -#if NETCOREAPP || NET47 #region ECDsa(ES) #region 256 // 署名（X509） jWS_ES256_X509 = new JWS_ES256_X509(Program.PrivateECDsaX509_256Path, Program.PfxPassword); token = jWS_ES256_X509.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_ES256_X509.Create", token); // 鍵の相互変換 @@ -715,27 +754,24 @@ private static void MyJwt() jwk = epkc.ParamToJwk( ((ECDsa)jWS_ES256_X509.DigitalSignECDsaX509.AsymmetricAlgorithm).ExportParameters(false)); - MyDebug.OutputDebugAndConsole("ECDSA JWK", jwk); + TIPD.MyDebug.OutputDebugAndConsole("ECDSA JWK", jwk); // 検証（X509） jWS_ES256_X509 = new JWS_ES256_X509(Program.PublicECDsaX509_256Path, ""); - MyDebug.OutputDebugAndConsole("JWS_ES256_X509.Verify", jWS_ES256_X509.Verify(token).ToString()); -#if NET47 || NETCOREAPP3_0 + TIPD.MyDebug.OutputDebugAndConsole("JWS_ES256_X509.Verify", jWS_ES256_X509.Verify(token).ToString()); + // 検証（Param） //// Core2.0-2.2 on WinでVerifyがエラーになる。 //// DigitalSignECDsaOpenSslを試してみるが生成できない、 //// Core on Win に OpenSSLベースのプロバイダは無いため） jWS_ES256_Param = new JWS_ES256_Param(epkc.JwkToParam(jwk), false); MyDebug.OutputDebugAndConsole("JWS_ES256_Param.Verify", jWS_ES256_Param.Verify(token).ToString()); -#elif NETCOREAPP2_0 - // Core2.0-2.2 on Winで ECDsaCngは動作しない。 -#endif + // ★ xLibTest Program.VerifyResultJwt("JwsAlgorithm.xLibTest", token, jWS_ES256_X509.DigitalSignECDsaX509.AsymmetricAlgorithm, JwsAlgorithm.ES256); #endregion -#if NETCOREAPP -#else + #region 384 // 署名（X509） jWS_ES384_X509 = new JWS_ES384_X509(Program.PrivateECDsaX509_384Path, Program.PfxPassword); @@ -757,16 +793,13 @@ private static void MyJwt() jWS_ES384_X509 = new JWS_ES384_X509(Program.PublicECDsaX509_384Path, ""); MyDebug.OutputDebugAndConsole("JWS_ES384_X509.Verify", jWS_ES384_X509.Verify(token).ToString()); -#if NET47 || NETCOREAPP3_0 // 検証（Param） //// Core2.0-2.2 on WinでVerifyがエラーになる。 //// DigitalSignECDsaOpenSslを試してみるが生成できない、 //// Core on Win に OpenSSLベースのプロバイダは無いため） jWS_ES384_Param = new JWS_ES384_Param(epkc.JwkToParam(jwk), false); MyDebug.OutputDebugAndConsole("JWS_ES384_Param.Verify", jWS_ES384_Param.Verify(token).ToString()); -#elif NETCOREAPP2_0 - // Core2.0-2.2 on Winで ECDsaCngは動作しない。 -#endif + // ★ xLibTest Program.VerifyResultJwt("JwsAlgorithm.xLibTest", token, jWS_ES384_X509.DigitalSignECDsaX509.AsymmetricAlgorithm, JwsAlgorithm.ES384); #endregion @@ -792,44 +825,44 @@ private static void MyJwt() jWS_ES512_X509 = new JWS_ES512_X509(Program.PublicECDsaX509_512Path, ""); MyDebug.OutputDebugAndConsole("JWS_ES512_X509.Verify", jWS_ES512_X509.Verify(token).ToString()); -#if NET47 || NETCOREAPP3_0 // 検証（Param） //// Core2.0-2.2 on WinでVerifyがエラーになる。 //// DigitalSignECDsaOpenSslを試してみるが生成できない、 //// Core on Win に OpenSSLベースのプロバイダは無いため） jWS_ES512_Param = new JWS_ES512_Param(epkc.JwkToParam(jwk), false); MyDebug.OutputDebugAndConsole("JWS_ES512_Param.Verify", jWS_ES512_Param.Verify(token).ToString()); -#elif NETCOREAPP2_0 - // Core2.0-2.2 on Winで ECDsaCngは動作しない。 -#endif + // ★ xLibTest Program.VerifyResultJwt("JwsAlgorithm.xLibTest", token, jWS_ES512_X509.DigitalSignECDsaX509.AsymmetricAlgorithm, JwsAlgorithm.ES512); #endregion -#endif + #endregion -#endif } else //if (os.Platform == PlatformID.Unix) { -#if NETCOREAPP #region RSA(RS256) // 署名（X509） jWS_RS256_X509 = new JWS_RS256_X509(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); token = jWS_RS256_X509.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_RS256_X509.Create", token); // 鍵の相互変換 rpkc = new RsaPublicKeyConverter(JWS_RSA.RS._256); jwk = rpkc.ParamToJwk(((RSA)jWS_RS256_X509.DigitalSignX509.AsymmetricAlgorithm).ExportParameters(false)); - MyDebug.OutputDebugAndConsole("RSA JWK", jwk); + + TIPD.MyDebug.OutputDebugAndConsole("RSA JWK", jwk); // 検証（X509） jWS_RS256_X509 = new JWS_RS256_X509(Program.PublicRsaX509Path, "", x509KSF); - MyDebug.OutputDebugAndConsole("JWS_RS256_X509.Verify", jWS_RS256_X509.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS256_X509.Verify", jWS_RS256_X509.Verify(token).ToString()); // 検証（Param） jWS_RS256_Param = new JWS_RS256_Param(rpkc.JwkToParam(jwk)); - MyDebug.OutputDebugAndConsole("JWS_RS256_Param.Verify", jWS_RS256_Param.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_RS256_Param.Verify", jWS_RS256_Param.Verify(token).ToString()); #endregion // DSA @@ -838,26 +871,29 @@ private static void MyJwt() // 署名（X509） jWS_ES256_X509 = new JWS_ES256_X509(Program.PrivateECDsaX509_256Path, Program.PfxPassword); token = jWS_ES256_X509.Create(payloadString); + + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt("JWS_ES256_X509.Create", token); // 鍵の相互変換 epkc = new EccPublicKeyConverter(JWS_ECDSA.ES._256); jwk = epkc.ParamToJwk(((ECDsa)jWS_ES256_X509.DigitalSignECDsaX509.AsymmetricAlgorithm).ExportParameters(false)); - MyDebug.OutputDebugAndConsole("ECDSA JWK", jwk); + TIPD.MyDebug.OutputDebugAndConsole("ECDSA JWK", jwk); // 検証（X509） jWS_ES256_X509 = new JWS_ES256_X509(Program.PublicECDsaX509_256Path, ""); - MyDebug.OutputDebugAndConsole("JWS_ES256_X509.Verify", jWS_ES256_X509.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_ES256_X509.Verify", jWS_ES256_X509.Verify(token).ToString()); // 検証（Param） jWS_ES256_Param = new JWS_ES256_Param(epkc.JwkToParam(jwk), false); - MyDebug.OutputDebugAndConsole("JWS_ES256_Param.Verify", jWS_ES256_X509.Verify(token).ToString()); + + TIPD.MyDebug.OutputDebugAndConsole("JWS_ES256_Param.Verify", jWS_ES256_X509.Verify(token).ToString()); // ★ xLibTest Program.VerifyResultJwt("JwsAlgorithm.xLibTest", token, jWS_ES256_X509.DigitalSignECDsaX509.AsymmetricAlgorithm, JwsAlgorithm.ES256); #endregion -#endif } #endregion @@ -871,7 +907,8 @@ private static void MyJwt() // 復号化 jwe = new JWE_RsaOaepAesGcm_X509(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); ret = jwe.Decrypt(token, out temp); - MyDebug.OutputDebugAndConsole("JWE_RsaOaepAesGcm_X509.Decrypt", ret.ToString() + " : " + temp); + + TIPD.MyDebug.OutputDebugAndConsole("JWE_RsaOaepAesGcm_X509.Decrypt", ret.ToString() + " : " + temp); // ★ xLibTest Program.VerifyResultJwt("JweAlgorithm.xLibTest", token, @@ -886,7 +923,8 @@ private static void MyJwt() // 復号化 jwe = new JWE_Rsa15A128CbcHS256_X509(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); ret = jwe.Decrypt(token, out temp); - MyDebug.OutputDebugAndConsole("JWE_Rsa15A128CbcHS256_X509.Decrypt", ret.ToString() + " : " + temp); + + TIPD.MyDebug.OutputDebugAndConsole("JWE_Rsa15A128CbcHS256_X509.Decrypt", ret.ToString() + " : " + temp); // ★ xLibTest Program.VerifyResultJwt("JweAlgorithm.xLibTest", token, @@ -952,9 +990,8 @@ private static void JoseJwt() CngKey privateKeyOfCng = null; RsaPublicKeyConverter rpkc = null; -#if NETCOREAPP || NET47 EccPublicKeyConverter epkc = null; -#endif + #endregion #endregion @@ -966,7 +1003,8 @@ private static void JoseJwt() // https://github.com/dvsekhvalnov/jose-jwt#creating-plaintext-unprotected-tokens token = ""; token = JWT.Encode(payload, null, JwsAlgorithm.none); - MyDebug.OutputDebugAndConsole("JwsAlgorithm.none", token); + + TIPD.MyDebug.OutputDebugAndConsole("JwsAlgorithm.none", token); #endregion #region JWS (Creating signed Tokens) @@ -985,14 +1023,19 @@ private static void JoseJwt() // RS256, RS384, RS512 and PS256, PS384, PS512 // https://github.com/dvsekhvalnov/jose-jwt#rs--and-ps--family // X509Certificate2 x509Certificate2 = new X509Certificate2(); +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicRsaX509Path); +#else privateX509Key = new X509Certificate2(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); publicX509Key = new X509Certificate2(Program.PublicRsaX509Path, "", x509KSF); +#endif token = ""; #if NETCOREAPP - rsa = (RSA)privateX509Key.PrivateKey; + rsa = (RSA)privateX509Key.GetRSAPrivateKey();//.PrivateKey; #else // .net frameworkでは、何故かコレが必要。 rsa = (RSA)AsymmetricAlgorithmCmnFunc.CreateSameKeySizeSP(privateX509Key.PrivateKey); @@ -1010,7 +1053,11 @@ private static void JoseJwt() y = new byte[] { 131, 116, 8, 14, 22, 150, 18, 75, 24, 181, 159, 78, 90, 51, 71, 159, 214, 186, 250, 47, 207, 246, 142, 127, 54, 183, 72, 72, 253, 21, 88, 53 }; d = new byte[] { 42, 148, 231, 48, 225, 196, 166, 201, 23, 190, 229, 199, 20, 39, 226, 70, 209, 148, 29, 70, 125, 14, 174, 66, 9, 198, 80, 251, 95, 107, 98, 206 }; +#if NETCOREAPP + if (OperatingSystem.IsWindows()) +#else if (os.Platform == PlatformID.Win32NT) +#endif { // https://github.com/dvsekhvalnov/jose-jwt/blob/master/jose-jwt/Security/Cryptography/EccKey.cs privateKeyOfCng = EccKey.New(x, y, d); @@ -1020,9 +1067,9 @@ private static void JoseJwt() token = JWT.Encode(payload, privateKeyOfCng, JwsAlgorithm.ES256); Program.VerifyResultJwt("JwsAlgorithm.ES256", token, publicKeyOfCng); } - else //if (os.Platform == PlatformID.Unix) - { #if NETCOREAPP + else if (OperatingSystem.IsLinux()) + { ECParameters eCParameters = new ECParameters(); epkc = new EccPublicKeyConverter(JWS_ECDSA.ES._256); @@ -1042,35 +1089,40 @@ private static void JoseJwt() token = ""; token = JWT.Encode(payload, eCDsaOpenSsl, JwsAlgorithm.ES256); Program.VerifyResultJwt("JwsAlgorithm.ES256", token, eCDsaOpenSsl); + } #endif + else + { + // その他のプラットフォーム } -#if NETCOREAPP || NET47 +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateECDsaX509_256Path, Program.PfxPassword); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicECDsaX509_256Path); +#else privateX509Key = new X509Certificate2(Program.PrivateECDsaX509_256Path, Program.PfxPassword); publicX509Key = new X509Certificate2(Program.PublicECDsaX509_256Path, ""); +#endif try { #if NETCOREAPP - if (os.Platform == PlatformID.Win32NT) - { - } - else //if (os.Platform == PlatformID.Unix) + if (OperatingSystem.IsLinux()) { // ECCurveを分析してみる。 ECCurve eCCurve = ((ECDsaOpenSsl)privateX509Key.GetECDsaPrivateKey()).ExportExplicitParameters(true).Curve; - MyDebug.OutputDebugAndConsole("Inspect ECCurve", ObjectInspector.Inspect(eCCurve)); + TIPD.MyDebug.OutputDebugAndConsole("Inspect ECCurve", TIPD.ObjectInspector.Inspect(eCCurve)); } #endif + token = ""; token = JWT.Encode(payload, privateX509Key.GetECDsaPrivateKey(), JwsAlgorithm.ES256); Program.VerifyResultJwt("JwsAlgorithm.ES256", token, publicX509Key.GetECDsaPublicKey()); } catch (Exception ex) { - MyDebug.OutputDebugAndConsole("JwsAlgorithm.ES256", ex.GetType().ToString() + ", " + ex.Message); + TIPD.MyDebug.OutputDebugAndConsole("JwsAlgorithm.ES256", ex.GetType().ToString() + ", " + ex.Message); } -#endif #endregion @@ -1082,25 +1134,30 @@ private static void JoseJwt() #region RSA-* key management family of algorithms // RSA-OAEP-256, RSA-OAEP and RSA1_5 key // https://github.com/dvsekhvalnov/jose-jwt#rsa--key-management-family-of-algorithms +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicRsaX509Path); +#else privateX509Key = new X509Certificate2(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); publicX509Key = new X509Certificate2(Program.PublicRsaX509Path, "", x509KSF); +#endif // RSAES-PKCS1-v1_5 and AES_128_CBC_HMAC_SHA_256 token = ""; - token = JWT.Encode(payload, publicX509Key.PublicKey.Key, JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256); - Program.VerifyResultJwt("JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256", token, privateX509Key.PrivateKey); + token = JWT.Encode(payload, publicX509Key.GetRSAPublicKey(), JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256); + Program.VerifyResultJwt("JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256", token, privateX509Key.GetRSAPrivateKey()); // RSAES-OAEP and AES GCM try { token = ""; - token = JWT.Encode(payload, publicX509Key.PublicKey.Key, JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM); - Program.VerifyResultJwt("JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM", token, privateX509Key.PrivateKey); + token = JWT.Encode(payload, publicX509Key.GetRSAPublicKey(), JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM); + Program.VerifyResultJwt("JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM", token, privateX509Key.GetRSAPrivateKey()); } catch (Exception ex) { // Unhandled Exception: System.DllNotFoundException: Unable to load DLL 'bcrypt.dll' at ubunntu - MyDebug.OutputDebugAndConsole("JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM", ex.GetType().ToString() + ", " + ex.Message); + TIPD.MyDebug.OutputDebugAndConsole("JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM", ex.GetType().ToString() + ", " + ex.Message); } #endregion @@ -1135,7 +1192,7 @@ private static void JoseJwt() catch (Exception ex) { // Unhandled Exception: System.DllNotFoundException: Unable to load DLL 'bcrypt.dll' at ubunntu - MyDebug.OutputDebugAndConsole("JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512", ex.GetType().ToString() + ", " + ex.Message); + TIPD.MyDebug.OutputDebugAndConsole("JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512", ex.GetType().ToString() + ", " + ex.Message); } #endregion @@ -1154,7 +1211,7 @@ private static void JoseJwt() catch (Exception ex) { // System.NotImplementedException: 'not yet' - MyDebug.OutputDebugAndConsole("JweAlgorithm.ECDH_ES, JweEncryption.A256GCM", ex.GetType().ToString() + ", " + ex.Message); + TIPD.MyDebug.OutputDebugAndConsole("JweAlgorithm.ECDH_ES, JweEncryption.A256GCM", ex.GetType().ToString() + ", " + ex.Message); } #endregion @@ -1185,11 +1242,17 @@ private static void JoseJwt() { "keyid", "111-222-333"} }; +#if NETCOREAPP + privateX509Key = X509CertificateLoader.LoadPkcs12FromFile(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); + publicX509Key = X509CertificateLoader.LoadCertificateFromFile(Program.PublicRsaX509Path); +#else privateX509Key = new X509Certificate2(Program.PrivateRsaX509Path, Program.PfxPassword, x509KSF); publicX509Key = new X509Certificate2(Program.PublicRsaX509Path, "", x509KSF); +#endif + #if NETCOREAPP - rsa = (RSA)privateX509Key.PrivateKey; + rsa = (RSA)privateX509Key.GetRSAPrivateKey(); #else // .net frameworkでは、何故かコレが必要。 rsa = (RSA)AsymmetricAlgorithmCmnFunc.CreateSameKeySizeSP(privateX509Key.PrivateKey); @@ -1203,7 +1266,7 @@ private static void JoseJwt() #region Strict validation // https://github.com/dvsekhvalnov/jose-jwt#strict-validation // 厳密な検証では、Algorithmを指定可能 - MyDebug.OutputDebugAndConsole("Strict validation(RS256)", JWT.Decode(token, rsa, JwsAlgorithm.RS256)); + TIPD.MyDebug.OutputDebugAndConsole("Strict validation(RS256)", JWT.Decode(token, rsa, JwsAlgorithm.RS256)); #endregion #region Two-phase validation @@ -1311,7 +1374,7 @@ private static void SignedXml() // 外側 (a ret = signedXml.Verify(xml, "a"); - MyDebug.OutputDebugAndConsole("Verify nested signedXml", ret.ToString() + " : " + xml); + TIPD.MyDebug.OutputDebugAndConsole("Verify nested signedXml", ret.ToString() + " : " + xml); } #endregion @@ -1327,17 +1390,18 @@ private static void SignedXml() /// JwsAlgorithm? private static void VerifyResultJwt(string testLabel, string jwt, object key, JwsAlgorithm? alg = null) { - MyDebug.OutputDebugAndConsole(testLabel, "Original:" + jwt); + TIPD.MyDebug.OutputDebugAndConsole(testLabel, "Original:" + jwt); + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt(testLabel, jwt); if (alg.HasValue) { - MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key, alg.Value)); + TIPD.MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key, alg.Value)); } else { - MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key)); + TIPD.MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key)); } } @@ -1349,11 +1413,12 @@ private static void VerifyResultJwt(string testLabel, string jwt, object key, Jw /// JweEncryption private static void VerifyResultJwt(string testLabel, string jwt, object key, JweAlgorithm alg, JweEncryption enc) { - MyDebug.OutputDebugAndConsole(testLabel, "Original:" + jwt); + TIPD.MyDebug.OutputDebugAndConsole(testLabel, "Original:" + jwt); + Touryo.Infrastructure.Public.Security. MyDebug.InspectJwt(testLabel, jwt); - MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key, alg, enc)); + TIPD.MyDebug.OutputDebugAndConsole(testLabel, "Decoded:" + JWT.Decode(jwt, key, alg, enc)); } #endregion diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Result48.txt b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Result48.txt index 58e7f3b41..6d53435aa 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Result48.txt +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/Result48.txt @@ -1,14 +1,10 @@ HashAlgorithm.Default > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.MD5_CSP > FQ2+bMMhF8fDG0fkIOd9fA== +HashAlgorithm.MD5 > FQ2+bMMhF8fDG0fkIOd9fA== HashAlgorithm.RIPEMD160_M > +2KFDwtYWpBfxsGkJU4SR/6NA8E= -HashAlgorithm.SHA1_CSP > wFTHz2IcQbeEekZ1o41FXOoYqHs= -HashAlgorithm.SHA1_M > wFTHz2IcQbeEekZ1o41FXOoYqHs= -HashAlgorithm.SHA256_CSP > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.SHA256_M > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.SHA384_CSP > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V -HashAlgorithm.SHA384_M > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V -HashAlgorithm.SHA512_CSP > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== -HashAlgorithm.SHA512_M > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== +HashAlgorithm.SHA1 > wFTHz2IcQbeEekZ1o41FXOoYqHs= +HashAlgorithm.SHA256 > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= +HashAlgorithm.SHA384 > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V +HashAlgorithm.SHA512 > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== HashAlgorithm.MD5_CNG > FQ2+bMMhF8fDG0fkIOd9fA== HashAlgorithm.SHA1_CNG > wFTHz2IcQbeEekZ1o41FXOoYqHs= HashAlgorithm.SHA256_CNG > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= @@ -29,17 +25,38 @@ GetPasswordHashV2.EqualSaltedPassword (new) > True ---------------------------------------------------------------------------------------------------- RSA > X509Certificate2.PrivateKey: is not null RSA > SignatureAlgorithm.FriendlyName: sha256RSA -RSA > PrivateKey.ToString(): is System.Security.Cryptography.RSACryptoServiceProvider +RSA > PrivateKey.ToString(): is System.Security.Cryptography.RSACng RSA > publicX509Key: is not null RSA > SignatureAlgorithm.FriendlyName: sha256RSA RSA > PublicKey.ToString(): is System.Security.Cryptography.X509Certificates.PublicKey -RSA > PublicKey.Key.ToString(): is System.Security.Cryptography.RSACryptoServiceProvider +RSA > PublicKey.Key.ToString(): is System.Security.Cryptography.RSACng +DSA > X509Certificate2.PrivateKey: is not null +DSA > SignatureAlgorithm.FriendlyName: +DSA > PrivateKey.ToString(): is System.Security.Cryptography.DSACng +DSA > publicX509Key: is not null +DSA > SignatureAlgorithm.FriendlyName: +DSA > PublicKey.ToString(): is System.Security.Cryptography.X509Certificates.PublicKey +DSA > PublicKey.Key.ToString(): is System.Security.Cryptography.DSACng +privateDSA > is not null +ECDsa > X509Certificate2.PrivateKey: is not null +ECDsa > SignatureAlgorithm.FriendlyName: sha256ECDSA +ECDsa > PrivateKey.ToString(): is System.Security.Cryptography.ECDsaCng +ECDsa > publicX509Key: is not null +ECDsa > SignatureAlgorithm.FriendlyName: sha256ECDSA +ECDsa > PublicKey.ToString(): is System.Security.Cryptography.X509Certificates.PublicKey +ECDsa > PublicKey.Key.ToString(): is System.Security.Cryptography.ECDsaCng +privateECDsa > is not null +publicECDsa > is not null ASymCrypt(X509).Enc&Dec > True DigitalSignX509.Verify(RS256) > True DigitalSignParam.Verify(RS256) > True DigitalSignXML.Verify(RS256) > True DigitalSignParam.Verify(DSA-SHA1) > True DigitalSignXML.Verify(DSA-SHA1) > True +DigitalSignECDsaX509.Verify(ECDSA-SHA256) > True +DigitalSignParam.Verify(ECDSA-P256) > True +DigitalSignECDsaX509.Verify(ECDSA-SHA512) > True +DigitalSignParam.Verify(ECDSA-P521) > True ---------------------------------------------------------------------------------------------------- JWS_HS256.Create > JWS Header: {"alg":"HS256","typ":"JWT"} JWS_HS256.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} @@ -65,8 +82,8 @@ JWS_RS256_X509.Verify > True JWS_RS256_Param.Verify > True jWS_RS384_XML.Create > JWS Header: {"alg":"RS384","typ":"JWT"} jWS_RS384_XML.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -jWS_RS384_XML.Create > JWS Signature: YqfhWA6lXCZEQ8YHqpcaFoWXJ0j4ng_4z21dM2ErOZy2QUmUvzoUatSl3GWmbob0Az83T3mTSNQt93m5YRF5nbqD01zjq5as-q8IWIAvblQPPfm2x-OpYCDX0KECvJCcMLoZqqgWz-ItzbMIAk6dOHig7gaxsGSQlK1aeFRmxWk -RSA JWK > {"kty":"RSA","alg":"RS384","n":"wLWupuAZvAB9lMmTJJsZA0KXDdnTfQAkjxDHkIszRrb6iFHZONS22HM60SWu92_dpk7N1XGtEXSnt9dN9ycbfjrggAMj1XSWcVyu-u6ogtVSOnpnll7Awqpisv1e-kUxdK1XbqIak3KuXLFlMud4hGjspcFjovsG5H-XpecJ7Vk","e":"AQAB","kid":"L7nic1BgbAjjpSiFXPx8lVln3fnNi66zGXZofxeV6AH39_ReQG5yOKCIwOkq588U"} +jWS_RS384_XML.Create > JWS Signature: GYtiAAj6L44GHM2qypvONV8lNM2OPtwrTnfYD6j5Q9lyIHWP6h0iK9bp3TNno_-A63xosowbWK3IuyMx1FKsu2IqLiyjjBwp7jsE8UbOlPF2usFizii_5hgiVYVAXos7A0VdbTs8A0bINjGjh4cH3yPAXzHKsD4-6hYANWilod8 +RSA JWK > {"kty":"RSA","alg":"RS384","n":"vBRhj9ifBc_zAm5kkH9KOMKf1m_xrbXpkaMsFw_ZZtl3kD-fQzquUd04E7-OAbbe5xj4W1O_ec2w4ODqdcZGeD4vCqr9aiO04a3iPyncdPq07in2Va_gUa8VGJZPrOv25tt2vDvLeY9gs4COgPpvem39kgBaPSrdZ5wi6t8P3TE","e":"AQAB","kid":"ckOA08yMty7xvdwDUtRWO28qoilvZssjrj41DONhyGOT6FY5aN-nLsTp02_Co08c"} JWS_RS384_XML.Verify > True JWS_RS384_Param.Verify > True JWS_RS512_X509.Create > JWS Header: {"alg":"RS512","typ":"JWT"} @@ -75,21 +92,56 @@ JWS_RS512_X509.Create > JWS Signature: Hu7kkEBidhzIDOT-GDElTyZutarV9q5K29say3_dN RSA JWK > {"kty":"RSA","alg":"RS512","n":"nOSgXEBwV-maKTcGlGAFL6KPyTQB7Z0G0Z4ewZi5rhFhEDsZRLV5p3_AqWQQlZFVrIJ_6wdrBY5sCAle6av654jqnI8AqxVV-OL-COmrhVMhrikRXxhxATAzo0Gf_hjW0yux8Ns2HT72PVscjBk9SKeedcorMjWWJPfr1zwsByLaSz8pQApBccRk_bUc-oBHRpDanPFz23v4ts3RXso05G8UZmcaqDqjMsVZfI3Cd3jqaWdb6NeeUw0DZDtMJObOJExJN43LO7rvtWmYXlEgLp-rCTI6CQ0Cmo4WuLU8Rv03fXQXGX0jDNeqfck8EEj7NwJWCvtf_AYaZ6hGcw2PMw","e":"AQAB","kid":"w8oMM75dlmuzJhKJmh8lS3VtmPxuWPxFk6SlZ0BGOdcE67qkeIDNhHwc1ZDO8_sfqNxBxBXSS6MU96wFO6J_Iw"} JWS_RS512_X509.Verify > True JWS_RS512_Param.Verify > True +JWS_ES256_X509.Create > JWS Header: {"alg":"ES256","typ":"JWT"} +JWS_ES256_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES256_X509.Create > JWS Signature: bDS8uIGDfDIuYcOOiEbl0GsEVSUNSl22y1vXERK_KbORH2VdJVdULkxkBXw15fMfRrGYUQkVWwlKW3EdkQ1rPg +ECDSA JWK > {"kty":"EC","alg":"ES256","crv":"P-256","x":"qdS3bsts3UXi5p0G71GofUB9ls1fJz_z0dRQw9RZ99A","y":"hX6HISTIiDLt90VDEqGmsMj2kSlGLOcXgXSqz75EhV4","kid":"asm1SGqVczG7zj0saZPKiggv2xwRlb6c23CDCNBqBNA"} +JWS_ES256_X509.Verify > True +JWS_ES256_Param.Verify > True +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.bDS8uIGDfDIuYcOOiEbl0GsEVSUNSl22y1vXERK_KbORH2VdJVdULkxkBXw15fMfRrGYUQkVWwlKW3EdkQ1rPg +JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES256","typ":"JWT"} +JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.xLibTest > JWS Signature: bDS8uIGDfDIuYcOOiEbl0GsEVSUNSl22y1vXERK_KbORH2VdJVdULkxkBXw15fMfRrGYUQkVWwlKW3EdkQ1rPg +JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES384_X509.Create > JWS Header: {"alg":"ES384","typ":"JWT"} +JWS_ES384_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES384_X509.Create > JWS Signature: Mqm-d-FC7NZ9bniVD9UYcnMJe5pJB-Hi_Kff18AyZ068k3aDac_Rb8ijEXf0TYJLTrbl-E6ToPpgfK7N0VZxPy1sFMygZDAIi_D40jwTFqJXmaplMFhAnt6bACQG7mby +JWS_ES384_X509.Verify > True +ECDSA JWK > {"kty":"EC","alg":"ES384","crv":"P-384","x":"qeyd2iMw8DZT7Yy3KO0mOuok1JBBdMwEuJTa81Upg06fbVbotK8yuhDSVkzSFsw3","y":"thH6faasSDmEO4zeVNdc5LbZJprQmL7JN3NZzYUJmF1GhQEl6QaZh-6f1QhDH0St","kid":"e_kI1ZJ_x9ttzEU_DICgGhJeNK8ghcW3bSl7KFM6eVefpKJHA5ecCowzJw69r9Vr"} +JWS_ES384_X509.Verify > True +JWS_ES384_Param.Verify > False +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.Mqm-d-FC7NZ9bniVD9UYcnMJe5pJB-Hi_Kff18AyZ068k3aDac_Rb8ijEXf0TYJLTrbl-E6ToPpgfK7N0VZxPy1sFMygZDAIi_D40jwTFqJXmaplMFhAnt6bACQG7mby +JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES384","typ":"JWT"} +JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.xLibTest > JWS Signature: Mqm-d-FC7NZ9bniVD9UYcnMJe5pJB-Hi_Kff18AyZ068k3aDac_Rb8ijEXf0TYJLTrbl-E6ToPpgfK7N0VZxPy1sFMygZDAIi_D40jwTFqJXmaplMFhAnt6bACQG7mby +JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES512_X509.Create > JWS Header: {"alg":"ES512","typ":"JWT"} +JWS_ES512_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES512_X509.Create > JWS Signature: AJxgTQH_qS55UyUyYSrNG1G5bfnU_g8qto77lsWSLRSqgGzK5aIhYz1jBx3doDJTEmDthiB7Ane52TvOnj_XnIIIAG-iGaMKlEEbyS0S6esD7pRcp7wUuAp1iZt-GTY9d_xN1wKayxJPw-T2H7fXGzq8YgF2doLvP5YSdIHiLzYm4n9E +JWS_ES512_X509.Verify > True +ECDSA JWK > {"kty":"EC","alg":"ES512","crv":"P-521","x":"AQoRdSDzXLfin6CFhLxDOL0_Cfn-QcwgdbMkMGgwTeA4gDIygCOEy4m0eyTmEnjYdBOMN5JtYUiprdZZriAGzrHC","y":"ATj5JBej9ztfsArJLUMCs4edyCgPuItefh7KFGfeefI7YjB-pakcKxzhHZ1h2UhR183bnQ4rrXc71N5WAl3d5BqZ","kid":"OaO51pUD4-aJ8skED2eag0nvd1kfqIwo9BhB86PEZ34PBLE4TiHv6v9LCK20r0c6x06bULLSi84PcldSN2n6DQ"} +JWS_ES512_X509.Verify > True +JWS_ES512_Param.Verify > False +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.AJxgTQH_qS55UyUyYSrNG1G5bfnU_g8qto77lsWSLRSqgGzK5aIhYz1jBx3doDJTEmDthiB7Ane52TvOnj_XnIIIAG-iGaMKlEEbyS0S6esD7pRcp7wUuAp1iZt-GTY9d_xN1wKayxJPw-T2H7fXGzq8YgF2doLvP5YSdIHiLzYm4n9E +JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES512","typ":"JWT"} +JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.xLibTest > JWS Signature: AJxgTQH_qS55UyUyYSrNG1G5bfnU_g8qto77lsWSLRSqgGzK5aIhYz1jBx3doDJTEmDthiB7Ane52TvOnj_XnIIIAG-iGaMKlEEbyS0S6esD7pRcp7wUuAp1iZt-GTY9d_xN1wKayxJPw-T2H7fXGzq8YgF2doLvP5YSdIHiLzYm4n9E +JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JWE_RsaOaepAesGcm_X509.Decrypt > True : {"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ0eXAiOiJKV1QifQ.fts8HONDMJLEfw5-viNwgOofdplLf4AYppRFodgo_vw_ZzGbKIUOsyLwlo73PN1dpIehjmXQB2yeSxGxBgsHJP3yW5uFaG9oa8N5Cb3IJREIJJhQ9gaxNfHGthvsvyxVFneF482oIo_YiV2-Dd4JpAuiChFxZyC-CQAGzA5YuyIqGsg6xRdfQaF9cSJ00UAKG_4DEO3xmb3SkXi1M-KWnItAh2Xp9B6CCPI-OPeZH4MCK8jjL_BhjChNE0fGQEAjfxGn-c16ec-z__iIrnOQDuS6-2I6bw5BLfh6tzMlYB-eFEYPXkO8T6HyGj8byXJAqorcl2VcDFNsAo_gSKngHQ.rg61cEdCgly9JRB_.13t-JrDkfZADMlpDc3QnaVIcUPHPL8demegMwVuUiOobFofM4Vcj_KMgiA.z5MvXMNX4VdKWlFbsGPTrQ +JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ0eXAiOiJKV1QifQ.QzqiUMQh1bbmG8As9A4s0XXsMUR27oj5IJ8aazVZAWc2yf9F3BfCQaFR8M2Mcwglr9SXTgcBqJSgGItFgXiSt7UEtey06ubImo9gAp9BgcQmQTjsVTBHW5VWLJH23jnOCDl_XmqqE_Aqb992QvpiKdrgnvTg4qlyFymtJxU_xlcfsL8B5JqApiTQBPj96J7ta9vgZQx7tFOh23jGS5kt-7onNWs7NLOPVVM1wtEh4a49JLQl9gLfocMGnV9q_X2CEq-35XIe8dkfX_BsSh50YvMlbRSTCCmiGnumsMF77v_22WakHtFqsgEiNq7ZWXhaSKPLe-rVXaikkzUbtn8Mnw.p5ht61WtDaG_z9si.Hr2vtD16A9_rQDBn1F8kMp2OCsByvZXxF_4GAOvFugkwTnbOi1h_AJdtjg.3zK5dgHR3hZB4l5I2tTmFg JweAlgorithm.xLibTest > JWE Header: {"alg":"RSA-OAEP","enc":"A256GCM","typ":"JWT"} -JweAlgorithm.xLibTest > JWE Encrypted Key: fts8HONDMJLEfw5-viNwgOofdplLf4AYppRFodgo_vw_ZzGbKIUOsyLwlo73PN1dpIehjmXQB2yeSxGxBgsHJP3yW5uFaG9oa8N5Cb3IJREIJJhQ9gaxNfHGthvsvyxVFneF482oIo_YiV2-Dd4JpAuiChFxZyC-CQAGzA5YuyIqGsg6xRdfQaF9cSJ00UAKG_4DEO3xmb3SkXi1M-KWnItAh2Xp9B6CCPI-OPeZH4MCK8jjL_BhjChNE0fGQEAjfxGn-c16ec-z__iIrnOQDuS6-2I6bw5BLfh6tzMlYB-eFEYPXkO8T6HyGj8byXJAqorcl2VcDFNsAo_gSKngHQ -JweAlgorithm.xLibTest > JWE Initialization Vector: rg61cEdCgly9JRB_ -JweAlgorithm.xLibTest > JWE Ciphertext: 13t-JrDkfZADMlpDc3QnaVIcUPHPL8demegMwVuUiOobFofM4Vcj_KMgiA -JweAlgorithm.xLibTest > JWE Authentication Tag: z5MvXMNX4VdKWlFbsGPTrQ +JweAlgorithm.xLibTest > JWE Encrypted Key: QzqiUMQh1bbmG8As9A4s0XXsMUR27oj5IJ8aazVZAWc2yf9F3BfCQaFR8M2Mcwglr9SXTgcBqJSgGItFgXiSt7UEtey06ubImo9gAp9BgcQmQTjsVTBHW5VWLJH23jnOCDl_XmqqE_Aqb992QvpiKdrgnvTg4qlyFymtJxU_xlcfsL8B5JqApiTQBPj96J7ta9vgZQx7tFOh23jGS5kt-7onNWs7NLOPVVM1wtEh4a49JLQl9gLfocMGnV9q_X2CEq-35XIe8dkfX_BsSh50YvMlbRSTCCmiGnumsMF77v_22WakHtFqsgEiNq7ZWXhaSKPLe-rVXaikkzUbtn8Mnw +JweAlgorithm.xLibTest > JWE Initialization Vector: p5ht61WtDaG_z9si +JweAlgorithm.xLibTest > JWE Ciphertext: Hr2vtD16A9_rQDBn1F8kMp2OCsByvZXxF_4GAOvFugkwTnbOi1h_AJdtjg +JweAlgorithm.xLibTest > JWE Authentication Tag: 3zK5dgHR3hZB4l5I2tTmFg JweAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JWE_Rsa15A128CbcHS256_X509.Decrypt > True : {"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwidHlwIjoiSldUIn0.OPBQZY-Q282eP30S-3u9hxf1cOVO_dQYJ-FB7aaKgYxSTRNtXr0XtNzVvIdXNsb6_2TFPtaj2MEuIgtF0hJlRBdApmexme9avc7oVyg37_lOkPXYDjdtv0EURfjAjyQC9DUBgxofUpmad85T0NzlSx45UOuM8-VTDFLCZU-KfNUuaUKhXeE6pG7-S8DFR1_mH6TarCZ_WELmc9mlbBBRjmO11hG8_hS8r0tx3E-LibR7IzqOCfXgL-ZxyCLzb9iqH4Iij0x_Y0_ORgCsmDDpW5-HCKHBwkUCCLy9aEjJWCcHIYVDHer_kkhDS2u1BcM_c0JGlT9BK-Q96pv-R3gxyQ.JcOeQyHxhR8zqwy19wyxIg.ivGGYZeu8QPYWB5u3AvIn3rOCXMKtCLSlCtO3mq3HJqBNGvGL2198-JO5S-QY79c.47TA7zkeXkj9HPkX7hZCng +JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwidHlwIjoiSldUIn0.AbOg32Wq4VUypLhrYFe9ibRCUFV89I0mlK5W8U9kTiyifX6OGuYqhSDYzSlznhva3TWkiq4nYrKU-7Ke9JV3sQu_02r5YP1kymko7h-511AOWg7cSgfMLCMbMZNBSwi5DMZq4YZSvSCtdEyLR0qGTolPJ5B1mzrBuSqrGHR7YIJfdD7ppDyt6Ovb1zgMJ-9q3eQ-GTYcsz9sM8oe7V8_g3YgzpslUQRYoUS8n_Clrv4lJQvNxQkJBoAUU_u2OLkV77LpiThnYCGxyYIlzEHchMZyVH0NMf6A_GwEljo_hl0xt_nLPZjcargsA0GOkVnudsMDsvmArND2fvGhgihyVg.1cv_E7mfMc3aDY_c62IorQ.zwZqEErqyU4ykynxzXTkv_12UW4C7A4lP-PWV9DhPxr655vhi8jVEemLMMkpyxFf.zaQQjMyTDimHUC0aEcDLcA JweAlgorithm.xLibTest > JWE Header: {"alg":"RSA1_5","enc":"A128CBC-HS256","typ":"JWT"} -JweAlgorithm.xLibTest > JWE Encrypted Key: OPBQZY-Q282eP30S-3u9hxf1cOVO_dQYJ-FB7aaKgYxSTRNtXr0XtNzVvIdXNsb6_2TFPtaj2MEuIgtF0hJlRBdApmexme9avc7oVyg37_lOkPXYDjdtv0EURfjAjyQC9DUBgxofUpmad85T0NzlSx45UOuM8-VTDFLCZU-KfNUuaUKhXeE6pG7-S8DFR1_mH6TarCZ_WELmc9mlbBBRjmO11hG8_hS8r0tx3E-LibR7IzqOCfXgL-ZxyCLzb9iqH4Iij0x_Y0_ORgCsmDDpW5-HCKHBwkUCCLy9aEjJWCcHIYVDHer_kkhDS2u1BcM_c0JGlT9BK-Q96pv-R3gxyQ -JweAlgorithm.xLibTest > JWE Initialization Vector: JcOeQyHxhR8zqwy19wyxIg -JweAlgorithm.xLibTest > JWE Ciphertext: ivGGYZeu8QPYWB5u3AvIn3rOCXMKtCLSlCtO3mq3HJqBNGvGL2198-JO5S-QY79c -JweAlgorithm.xLibTest > JWE Authentication Tag: 47TA7zkeXkj9HPkX7hZCng +JweAlgorithm.xLibTest > JWE Encrypted Key: AbOg32Wq4VUypLhrYFe9ibRCUFV89I0mlK5W8U9kTiyifX6OGuYqhSDYzSlznhva3TWkiq4nYrKU-7Ke9JV3sQu_02r5YP1kymko7h-511AOWg7cSgfMLCMbMZNBSwi5DMZq4YZSvSCtdEyLR0qGTolPJ5B1mzrBuSqrGHR7YIJfdD7ppDyt6Ovb1zgMJ-9q3eQ-GTYcsz9sM8oe7V8_g3YgzpslUQRYoUS8n_Clrv4lJQvNxQkJBoAUU_u2OLkV77LpiThnYCGxyYIlzEHchMZyVH0NMf6A_GwEljo_hl0xt_nLPZjcargsA0GOkVnudsMDsvmArND2fvGhgihyVg +JweAlgorithm.xLibTest > JWE Initialization Vector: 1cv_E7mfMc3aDY_c62IorQ +JweAlgorithm.xLibTest > JWE Ciphertext: zwZqEErqyU4ykynxzXTkv_12UW4C7A4lP-PWV9DhPxr655vhi8jVEemLMMkpyxFf +JweAlgorithm.xLibTest > JWE Authentication Tag: zaQQjMyTDimHUC0aEcDLcA JweAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JwsAlgorithm.none > eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ. JwsAlgorithm.HS256 > Original:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.dvd5Ak6zcBy0OB7gxVtehT3Ab5NO7XEggon6r_CTSfE @@ -97,70 +149,75 @@ JwsAlgorithm.HS256 > JWS Header: {"alg":"HS256","typ":"JWT"} JwsAlgorithm.HS256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} JwsAlgorithm.HS256 > JWS Signature: dvd5Ak6zcBy0OB7gxVtehT3Ab5NO7XEggon6r_CTSfE JwsAlgorithm.HS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.RS256 > Original:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.jU5ofhOV4bs49nw3mJ_JilI6rnOdRxbPNdxQB-N0P9_wFVgXE_i354zTxDhWGWSsUyT4h3GETWD9yJIKKM90ml7wJYWOTqm9WcOFvZK-Dm-zqqD2M_LnkHRftEUk4eRauU70iz-YVfHLHzeOcH6yNEbjlqK3Q3hjlqiEoptjZwI +JwsAlgorithm.RS256 > Original:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.dCnfv92uWPC6q3quXU_a_fYPjZQreuNQIpFx5Qc1k61F_sQch8aNafx_SOP5vIm_eSaqKQSpg7f4BukGAvDMCBTTRANJvj4olE7nhEgzD3jmuvEcrovcM6c3Q6C7oTdNVCDZSRvluiI7rKLgFuLq1iQfTJdX_jPxOIkyO7VR8kA JwsAlgorithm.RS256 > JWS Header: {"alg":"RS256","typ":"JWT"} JwsAlgorithm.RS256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.RS256 > JWS Signature: jU5ofhOV4bs49nw3mJ_JilI6rnOdRxbPNdxQB-N0P9_wFVgXE_i354zTxDhWGWSsUyT4h3GETWD9yJIKKM90ml7wJYWOTqm9WcOFvZK-Dm-zqqD2M_LnkHRftEUk4eRauU70iz-YVfHLHzeOcH6yNEbjlqK3Q3hjlqiEoptjZwI +JwsAlgorithm.RS256 > JWS Signature: dCnfv92uWPC6q3quXU_a_fYPjZQreuNQIpFx5Qc1k61F_sQch8aNafx_SOP5vIm_eSaqKQSpg7f4BukGAvDMCBTTRANJvj4olE7nhEgzD3jmuvEcrovcM6c3Q6C7oTdNVCDZSRvluiI7rKLgFuLq1iQfTJdX_jPxOIkyO7VR8kA JwsAlgorithm.RS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.lJRKvOeXF9V01DHEEbi8gQlqNI8zjbVkF5Mo1IwdfhhoquA8fJAZnLLVL-vN3UNsywa73E1Vbh4zlgOopwns9w +JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.5sjTJ18OthXG2r7iWeuwX5F63oyMTYmHYEhTWaDnsZNbiImVfoMsv9m4ovocZmzeJRIuHnxokyEd1sHBtrSAog JwsAlgorithm.ES256 > JWS Header: {"alg":"ES256","typ":"JWT"} JwsAlgorithm.ES256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > JWS Signature: lJRKvOeXF9V01DHEEbi8gQlqNI8zjbVkF5Mo1IwdfhhoquA8fJAZnLLVL-vN3UNsywa73E1Vbh4zlgOopwns9w +JwsAlgorithm.ES256 > JWS Signature: 5sjTJ18OthXG2r7iWeuwX5F63oyMTYmHYEhTWaDnsZNbiImVfoMsv9m4ovocZmzeJRIuHnxokyEd1sHBtrSAog JwsAlgorithm.ES256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0.YEog_m1o_aw299crh6iCuVpSAzAbEs913ycos0GhL992eyW34fsSGZsu4gTaxBAUXAxTQuiDLGwyyDsUMVjQ_d49zyyjjli3mC5gZc-x-iVVYQxcHzZRu6WyeXp0dN4lHQp2uMT5i_xIdAMUOiqwBwLsli0ZJfhYrVQ3jSAln4nkxbwfpSj2uI_tX3FQf0WwibjE5tLw0xnOjUyvjim9KCGV6H4k1DippMk7eaodYZG95jkYP9g06ZS5Kgbq-T0P4SP9kemG2ga0Ps_xHBPAuufkk3oshumhSPucwjF-BsF3tPuC2GbxQ4iTeBVhQeRgsTSS3S7zQFa5k1rB3IikNA.HY8gVsPoqYI4iS6oZ67ksA.hIWp-_8Xql_1n_apVUdPidymEnk7PO3d372pu1FDbgd1IwdAlqRsu2IqTu_8NGao.z5oknxP-EaQBHKHa_k7T2A +JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.y9GTdsHGsPJwZbBXI54d1J-AFfpRmcxIEeJ7KqlyPyehkGS0p3h9OIyXJL67Nykg1IFPFkkk6cSI6aEpzRf36g +JwsAlgorithm.ES256 > JWS Header: {"alg":"ES256","typ":"JWT"} +JwsAlgorithm.ES256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.ES256 > JWS Signature: y9GTdsHGsPJwZbBXI54d1J-AFfpRmcxIEeJ7KqlyPyehkGS0p3h9OIyXJL67Nykg1IFPFkkk6cSI6aEpzRf36g +JwsAlgorithm.ES256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0.Y-Z-EuZU8migC37s312S2qyiLYHuT3e5SD4aswf9FKGtQ35V2OcsY4DqS1TRk8RF5e_YjHMAbXNz8heBNYmspx9PU8tJvAVfWrJhRvvt_SO0jpv7YD-HweQLAGMbE2WWGFrSFDWIJO2Hbijy4xKXqy920U1OrfK02rW-sOtNAXoCGrSV3WQd5eEUV4Z0gF16V3RiO33xtc6Gqy8kmSHSVdC7ThhUVhxGygbAZBbGdnq45iWj-SLD3l143nthn_6I51DKxuzrxTI8rnRFqgCiyrFXRYDJ4haLdg9vkMUg65WjE9OpUo2CD5TqzeW01K2_l5gvo3i_rV54TWWi0wld7Q.O6p_BYf5ETk6OXMPzLArpw.IxCHmLYKCg9DWcXIVJyzAYQ31efTIeDRH00NcDwdzgDqhE80zcIYm6t2TH88ers1.TtaEl82V_-cfXnI2fPPd2w JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Header: {"alg":"RSA1_5","enc":"A128CBC-HS256"} -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: YEog_m1o_aw299crh6iCuVpSAzAbEs913ycos0GhL992eyW34fsSGZsu4gTaxBAUXAxTQuiDLGwyyDsUMVjQ_d49zyyjjli3mC5gZc-x-iVVYQxcHzZRu6WyeXp0dN4lHQp2uMT5i_xIdAMUOiqwBwLsli0ZJfhYrVQ3jSAln4nkxbwfpSj2uI_tX3FQf0WwibjE5tLw0xnOjUyvjim9KCGV6H4k1DippMk7eaodYZG95jkYP9g06ZS5Kgbq-T0P4SP9kemG2ga0Ps_xHBPAuufkk3oshumhSPucwjF-BsF3tPuC2GbxQ4iTeBVhQeRgsTSS3S7zQFa5k1rB3IikNA -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: HY8gVsPoqYI4iS6oZ67ksA -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Ciphertext: hIWp-_8Xql_1n_apVUdPidymEnk7PO3d372pu1FDbgd1IwdAlqRsu2IqTu_8NGao -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: z5oknxP-EaQBHKHa_k7T2A +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: Y-Z-EuZU8migC37s312S2qyiLYHuT3e5SD4aswf9FKGtQ35V2OcsY4DqS1TRk8RF5e_YjHMAbXNz8heBNYmspx9PU8tJvAVfWrJhRvvt_SO0jpv7YD-HweQLAGMbE2WWGFrSFDWIJO2Hbijy4xKXqy920U1OrfK02rW-sOtNAXoCGrSV3WQd5eEUV4Z0gF16V3RiO33xtc6Gqy8kmSHSVdC7ThhUVhxGygbAZBbGdnq45iWj-SLD3l143nthn_6I51DKxuzrxTI8rnRFqgCiyrFXRYDJ4haLdg9vkMUg65WjE9OpUo2CD5TqzeW01K2_l5gvo3i_rV54TWWi0wld7Q +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: O6p_BYf5ETk6OXMPzLArpw +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Ciphertext: IxCHmLYKCg9DWcXIVJyzAYQ31efTIeDRH00NcDwdzgDqhE80zcIYm6t2TH88ers1 +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: TtaEl82V_-cfXnI2fPPd2w JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ.E71VLnCidYqDvi91jV7NUh8I5dkt0tKJM3aAkzfrUUcvXoC-kkBA5HcnKQZLBQhymWb0nadVbVtJdut8BXpDrPK7zIv-cla2FmFcABPewQbPO7ip4kZ65ni4yudinP90hu6uldJCA8XK5Rk2HvRHr0tniEWatMrDu_TnGokEzfEwEbKzZSDhB_Xc8SHgPsocsbS5hUoOqQpxHWGXULQEwnLAAN2u1S6AeTHeZmh-pwnbzpG6tiUMjGjTwzodtFp8HNAngqzjWNxQ5Ykq2IVgSB1CXbhUrMBSOA-vA8lUevsFTa82gKtg6PSKsVdazxVfMzZzMnNQ5BBv8bkiJ0rvXg.MnYiPzpFlFnng5Og.EzXAcYfk29XNmtb_rQvKk3KYSNHodFvQ_1QoNVQhIuIPtI6jZtHFQdfDMA.mtBv8CB5QkzfX4PLXThLWw +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ.IOfHVVGvdIJiMfsRG6L28LVOD0t14-EXFEFLYZrGJiXoRHwoYVnP1IcQOK5Wx28V7AzkZ7zNnKEymrMPedt5nsORo4ctv8LsHX1zS_xFGfB4OB1EfSj5LUaZ0JkKcEyH0aJ7gcyv578hci1gVu-zloTRUb56IgLUUiCi0MkjXVAYocY2wgDeFtiLdgaTP_aIpVEwCOrCjQWDrguyhQzI52O9sa0W7HjV34iAAWFf1eLqx0klp48NOvegHh0hTu1850t3PE9FsCzfNqFclsWHjzRpCzxE2IZCUzXxaHNd79KlaXRhzphJ5OocCvOF7me1GGMEz7XwZRAjft_GPDeEDg.akAAMGRTkDsjmr7x.kOOA9YbIk8oUIe_Yp4EnwSjo-bQm_aVaWO1LNwwzDQexvmmPrIjJOzX-tQ.AzhMl3Kmr_eoiNrZjelA3w JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Header: {"alg":"RSA-OAEP","enc":"A256GCM"} -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Encrypted Key: E71VLnCidYqDvi91jV7NUh8I5dkt0tKJM3aAkzfrUUcvXoC-kkBA5HcnKQZLBQhymWb0nadVbVtJdut8BXpDrPK7zIv-cla2FmFcABPewQbPO7ip4kZ65ni4yudinP90hu6uldJCA8XK5Rk2HvRHr0tniEWatMrDu_TnGokEzfEwEbKzZSDhB_Xc8SHgPsocsbS5hUoOqQpxHWGXULQEwnLAAN2u1S6AeTHeZmh-pwnbzpG6tiUMjGjTwzodtFp8HNAngqzjWNxQ5Ykq2IVgSB1CXbhUrMBSOA-vA8lUevsFTa82gKtg6PSKsVdazxVfMzZzMnNQ5BBv8bkiJ0rvXg -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Initialization Vector: MnYiPzpFlFnng5Og -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Ciphertext: EzXAcYfk29XNmtb_rQvKk3KYSNHodFvQ_1QoNVQhIuIPtI6jZtHFQdfDMA -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Authentication Tag: mtBv8CB5QkzfX4PLXThLWw +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Encrypted Key: IOfHVVGvdIJiMfsRG6L28LVOD0t14-EXFEFLYZrGJiXoRHwoYVnP1IcQOK5Wx28V7AzkZ7zNnKEymrMPedt5nsORo4ctv8LsHX1zS_xFGfB4OB1EfSj5LUaZ0JkKcEyH0aJ7gcyv578hci1gVu-zloTRUb56IgLUUiCi0MkjXVAYocY2wgDeFtiLdgaTP_aIpVEwCOrCjQWDrguyhQzI52O9sa0W7HjV34iAAWFf1eLqx0klp48NOvegHh0hTu1850t3PE9FsCzfNqFclsWHjzRpCzxE2IZCUzXxaHNd79KlaXRhzphJ5OocCvOF7me1GGMEz7XwZRAjft_GPDeEDg +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Initialization Vector: akAAMGRTkDsjmr7x +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Ciphertext: kOOA9YbIk8oUIe_Yp4EnwSjo-bQm_aVaWO1LNwwzDQexvmmPrIjJOzX-tQ +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Authentication Tag: AzhMl3Kmr_eoiNrZjelA3w JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0.._KGXhVKjZqHKxATyfenHFQ.wsLnJKWs3_CTCgZvmm2lWOdDyD8FEXli2C885vMo3AzVxdjPLVL95r1JPyB6qrJQ.sHX7-eHKmMh0Qwxd1PJG7w +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..gcGPcw6lYQ4-nUCB-I-Q-A.XROkpOO8PEr3IPKGnRWLp3sur6B3SqSogYb_TiUKi1sJuz1KgCIRoGZnZvHH9xCg.GbbV94uHu6Juz9GSW3-2ug JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Header: {"alg":"dir","enc":"A128CBC-HS256"} JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: _KGXhVKjZqHKxATyfenHFQ -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Ciphertext: wsLnJKWs3_CTCgZvmm2lWOdDyD8FEXli2C885vMo3AzVxdjPLVL95r1JPyB6qrJQ -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: sHX7-eHKmMh0Qwxd1PJG7w +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: gcGPcw6lYQ4-nUCB-I-Q-A +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Ciphertext: XROkpOO8PEr3IPKGnRWLp3sur6B3SqSogYb_TiUKi1sJuz1KgCIRoGZnZvHH9xCg +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: GbbV94uHu6Juz9GSW3-2ug JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.c-LavtgG1Iap2Eo9eaNTREFyRM7AQix7nEc_4_LMX-LCkoK-lVXK0D_KixJ-xVMBh7zHwYVgmtMJk9uIeJVrF4aOa-IDP_1b._vPLwpVNSy7PRg9MXZPsFQ.VLnUiwSOXsexRdMdTqjcHowBu1KukDNe9RmKwCYVJY8X8jsoFRZkOi23LLAobzk4.nvxDiygV-kP8eqachKUyPrrRqcBItmZQoaGjX24fnfs +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.nvzrNLij1eLkzWX9OvZv3lYCcKgxUjP5cqTUdq6SAT5jmB4Y6pdQ-1Gb_6NGJTf6k_AyjQca7cYHlijToocnekneR7dpibAS.wC0BKrRqaaure-mQP8DWuQ.QPL69JM4Nw6_iNlRJu63J8_eiHOVhAB591n2lewNZZlrmTjMeITdU69vuzlZebKZ.nxhdVnuH8G6ZtlPVIvQui2TxOvfuClY3A-sfZjs8aeo JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256KW","enc":"A256CBC-HS512"} -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: c-LavtgG1Iap2Eo9eaNTREFyRM7AQix7nEc_4_LMX-LCkoK-lVXK0D_KixJ-xVMBh7zHwYVgmtMJk9uIeJVrF4aOa-IDP_1b -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: _vPLwpVNSy7PRg9MXZPsFQ -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: VLnUiwSOXsexRdMdTqjcHowBu1KukDNe9RmKwCYVJY8X8jsoFRZkOi23LLAobzk4 -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: nvxDiygV-kP8eqachKUyPrrRqcBItmZQoaGjX24fnfs +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: nvzrNLij1eLkzWX9OvZv3lYCcKgxUjP5cqTUdq6SAT5jmB4Y6pdQ-1Gb_6NGJTf6k_AyjQca7cYHlijToocnekneR7dpibAS +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: wC0BKrRqaaure-mQP8DWuQ +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: QPL69JM4Nw6_iNlRJu63J8_eiHOVhAB591n2lewNZZlrmTjMeITdU69vuzlZebKZ +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: nxhdVnuH8G6ZtlPVIvQui2TxOvfuClY3A-sfZjs8aeo JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2R0NNS1ciLCJpdiI6IjNhSlFidUpzTEhBblpHdE0iLCJ0YWciOiJkNEVwUDNBa1lQRk5FSElua0M4QXpRIiwiZW5jIjoiQTI1NkNCQy1IUzUxMiJ9.PH8L1ifQjVPJ3dA7b6iAfRJNMpPS33nFXvtV_Z5gJIpGy5NLdOYzqNWM3plh4NsI-J6BNZ9bLXKpZRurfs7Wvw.HOvnWSn9IduyUvtZ-Ad5Og.3uyg_dt2yyU2okxDmYmzaXrydNrBaIJwLocK6MwFTStxY8UBkdhoDmhTTTlW77zr.3jPtbaal7IS1iFOSfZInRoo-q189zjNZKSczIQzpxxw -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256GCMKW","iv":"3aJQbuJsLHAnZGtM","tag":"d4EpP3AkYPFNEHInkC8AzQ","enc":"A256CBC-HS512"} -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: PH8L1ifQjVPJ3dA7b6iAfRJNMpPS33nFXvtV_Z5gJIpGy5NLdOYzqNWM3plh4NsI-J6BNZ9bLXKpZRurfs7Wvw -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: HOvnWSn9IduyUvtZ-Ad5Og -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: 3uyg_dt2yyU2okxDmYmzaXrydNrBaIJwLocK6MwFTStxY8UBkdhoDmhTTTlW77zr -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: 3jPtbaal7IS1iFOSfZInRoo-q189zjNZKSczIQzpxxw +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2R0NNS1ciLCJpdiI6IlcwbHQ1T1B0YzB5cHVybzYiLCJ0YWciOiJvMUd0VXR1YjhQTHBKb2I5ekdYVUtnIiwiZW5jIjoiQTI1NkNCQy1IUzUxMiJ9.UiTUcWTyHjkxA2khlzfJcEc62t-EHA8QpjeZu_K2xgeSbSSpNWJH9X_XsHYUU1W2aMG9cSMmw77ULxUWZLOUTg.jKUCAdU3VQ9GNECTVL27ug.FkbDex80HqKcsQ-M-HnJsL3VZSq49CkCHrL77VGTlTed7m135Jiy4kHsdgbbQqYL.rcQUTu0zg2oToqtZIS7oKvSlz94gfOaonwbDmNYwrRA +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256GCMKW","iv":"W0lt5OPtc0ypuro6","tag":"o1GtUtub8PLpJob9zGXUKg","enc":"A256CBC-HS512"} +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: UiTUcWTyHjkxA2khlzfJcEc62t-EHA8QpjeZu_K2xgeSbSSpNWJH9X_XsHYUU1W2aMG9cSMmw77ULxUWZLOUTg +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: jKUCAdU3VQ9GNECTVL27ug +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: FkbDex80HqKcsQ-M-HnJsL3VZSq49CkCHrL77VGTlTed7m135Jiy4kHsdgbbQqYL +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: rcQUTu0zg2oToqtZIS7oKvSlz94gfOaonwbDmNYwrRA JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > Original:eyJhbGciOiJFQ0RILUVTIiwiZXBrIjp7Imt0eSI6IkVDIiwieCI6IklXcFgyd2h6QjhLWHdqbWpDZDRReENWSkgwUGsxRjN6dzdFdG92WUljaDgiLCJ5IjoiaF9WUFl0Y3hoR29CMmNaZThZblRtU3paMzVCWWI5MGFfdzJHM01lclZMVSIsImNydiI6IlAtMjU2In0sImVuYyI6IkEyNTZHQ00ifQ..auii-8Ozc3QpbHVs.xS3BBVTaAzQ8VYlOPsivzvno8rpmSJMqiFUv2bjNqdGMmUdwn6R0iFZjIw.EClmn7qWfb_KRutPIjrxlA -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Header: {"alg":"ECDH-ES","epk":{"kty":"EC","x":"IWpX2whzB8KXwjmjCd4QxCVJH0Pk1F3zw7EtovYIch8","y":"h_VPYtcxhGoB2cZe8YnTmSzZ35BYb90a_w2G3MerVLU","crv":"P-256"},"enc":"A256GCM"} +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > Original:eyJhbGciOiJFQ0RILUVTIiwiZXBrIjp7Imt0eSI6IkVDIiwieCI6IlhEMmJkSDFONmtBRVJURE9pZ3J6M1dwVWdHVUxLTzNMdXJ3QVpnWHoxZ28iLCJ5IjoiREtpdFM5eFQ5Vy1vUW1GUE1OcmgySGlXbDV5Q3NGREdEQWJpaDBBLVdiTSIsImNydiI6IlAtMjU2In0sImVuYyI6IkEyNTZHQ00ifQ..4_YxIEHgT0S3THYo.fgzS9zycj3N3Ts4BNN5kIduq0dxmc-p7FPsxQRsLoPly7bxBjbRZWyMinw.pSS_005rtwkI8zS2ci4RcQ +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Header: {"alg":"ECDH-ES","epk":{"kty":"EC","x":"XD2bdH1N6kAERTDOigrz3WpUgGULKO3LurwAZgXz1go","y":"DKitS9xT9W-oQmFPMNrh2HiWl5yCsFDGDAbih0A-WbM","crv":"P-256"},"enc":"A256GCM"} JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Encrypted Key: -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Initialization Vector: auii-8Ozc3QpbHVs -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Ciphertext: xS3BBVTaAzQ8VYlOPsivzvno8rpmSJMqiFUv2bjNqdGMmUdwn6R0iFZjIw -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Authentication Tag: EClmn7qWfb_KRutPIjrxlA +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Initialization Vector: 4_YxIEHgT0S3THYo +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Ciphertext: fgzS9zycj3N3Ts4BNN5kIduq0dxmc-p7FPsxQRsLoPly7bxBjbRZWyMinw +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Authentication Tag: pSS_005rtwkI8zS2ci4RcQ JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > System.Security.Cryptography.CryptographicException, キーがありません。 -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJwMmMiOjgxOTIsInAycyI6Iml5aHJJTmR4dHpuOGwzWWYiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.gCVw3TyGjPiLXepao5bWe4BXa4-ZtSA7qAV1lQNOTyG9Pa4iUBo0iNkuJoqcuPzQWVQx4UIm9QsRPkr7YG8XWnBGuD4MHP2Q.s3dTLnF5W9zBMOfppm0o9A.cBS_TuTqSiJ5FiureuIK4igFiTpsfzFbhvPhvUURVos7PvwpG9y3XXKgazS8g57e.d0ilG2WnZLUWBRSVh2DZ1lLD0Xhn0G9lxMEQoae7_Sg -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"PBES2-HS256+A128KW","p2c":8192,"p2s":"iyhrINdxtzn8l3Yf","enc":"A256CBC-HS512"} -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: gCVw3TyGjPiLXepao5bWe4BXa4-ZtSA7qAV1lQNOTyG9Pa4iUBo0iNkuJoqcuPzQWVQx4UIm9QsRPkr7YG8XWnBGuD4MHP2Q -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: s3dTLnF5W9zBMOfppm0o9A -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: cBS_TuTqSiJ5FiureuIK4igFiTpsfzFbhvPhvUURVos7PvwpG9y3XXKgazS8g57e -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: d0ilG2WnZLUWBRSVh2DZ1lLD0Xhn0G9lxMEQoae7_Sg +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJwMmMiOjgxOTIsInAycyI6IjhoZVFTUXhHUTFsekZMOGkiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.4w8H_QQeqtndy2gxSZoPQXYkErH5ynn9XblJCOoiSSCzBL9o2PmrbWHGOxS7ot0WA5YXlFzqLP6RPe27JwbsFW_dNG4rZTjE.SkrHmQA8V4vV-O6QppWSzg.Oj4F5E9wx7wFLTs-zq45PQNfqVjK4H2D4fRs0AiGyRnzSfquNau49hpKg6fERiNJ.MkcoNWK1OgXT0BsrJ83HhhoTTno_1RdHqHtl1-BfyMM +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"PBES2-HS256+A128KW","p2c":8192,"p2s":"8heQSQxGQ1lzFL8i","enc":"A256CBC-HS512"} +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: 4w8H_QQeqtndy2gxSZoPQXYkErH5ynn9XblJCOoiSSCzBL9o2PmrbWHGOxS7ot0WA5YXlFzqLP6RPe27JwbsFW_dNG4rZTjE +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: SkrHmQA8V4vV-O6QppWSzg +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: Oj4F5E9wx7wFLTs-zq45PQNfqVjK4H2D4fRs0AiGyRnzSfquNau49hpKg6fERiNJ +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: MkcoNWK1OgXT0BsrJ83HhhoTTno_1RdHqHtl1-BfyMM JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -Adding extra headers to RS256 > Original:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6IkpXVCIsImtleWlkIjoiMTExLTIyMi0zMzMifQ.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.nqqldo29X3wKjTY0dE5ySbNgxBhwens1msUGwfF_l8jHk8tWvNihENbKLWGVt5RpqJLml8ULjU7zJ3C3U4_LYIDWMVwuan_XWtdSdjCxCiYEwIm63PdE1qLxtXPbmhzyYYtjra5VexOMeyDeo1DAeRNkehg_t5wh8Y-r6jyQOPs +Adding extra headers to RS256 > Original:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6IkpXVCIsImtleWlkIjoiMTExLTIyMi0zMzMifQ.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.FSr9pqYSF8WxBNdahQ30fFnmATRtUIvuNPn8Vzeb7tncuC-m3AiEqqP02hTskzYWb5yL65Ms8WUSPUpPuq3fpOAEPaMQlB_tD1Cm9VdUWVVb2QenpYErlwghhieiaRwhNxb_HtgMEVSaUGl19rbuVSQrFZbK4xF2vcl1Mf0AIcQ Adding extra headers to RS256 > JWS Header: {"alg":"RS256","typ":"JWT","cty":"JWT","keyid":"111-222-333"} Adding extra headers to RS256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -Adding extra headers to RS256 > JWS Signature: nqqldo29X3wKjTY0dE5ySbNgxBhwens1msUGwfF_l8jHk8tWvNihENbKLWGVt5RpqJLml8ULjU7zJ3C3U4_LYIDWMVwuan_XWtdSdjCxCiYEwIm63PdE1qLxtXPbmhzyYYtjra5VexOMeyDeo1DAeRNkehg_t5wh8Y-r6jyQOPs +Adding extra headers to RS256 > JWS Signature: FSr9pqYSF8WxBNdahQ30fFnmATRtUIvuNPn8Vzeb7tncuC-m3AiEqqP02hTskzYWb5yL65Ms8WUSPUpPuq3fpOAEPaMQlB_tD1Cm9VdUWVVb2QenpYErlwghhieiaRwhNxb_HtgMEVSaUGl19rbuVSQrFZbK4xF2vcl1Mf0AIcQ Adding extra headers to RS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} Strict validation(RS256) > {"sub":"mr.x@contoso.com","exp":1300819380} -Verify nested signedXml > True : +sg4j+LFYSzu6ZSzp2Jrh7CxLATJlNH/KTEQlXcfmtM=GOT6ly8PtfAyxS6JuV+zGDMxT1CBsp9sJn8qNYJ+WuFSgeOLiATpL35XUpA/cKPHiZAOw9jNEp0AB3CLzsrDbc6gJJTS73bpc/qqLXDBLEk4ksbJPfxtSPWi3Myz1hdVYxNFfrILmgXrupMJd65tGXbfqCVxRUsZpjeOsXkzqD4=poVTKgpGyKfxD8FtZpdcoBalxDtm6EDfobfiOOHzdFQ=LJptvBtEBCXwN1piIZ68XuDLN5OAF0D5M+SJBLIb5FNG1H0qiX/vCkQ6Q/IBB70eanmRTs+IH8Qn7AqNrte/S2IUz064R9mNzn+mrCVRGbPGwZkrGn+Xq5bs7c4uKKmZlQIOciQPgUW3VW8+lkDVQfJ3MoAS7BYOEY6NVG0H0aU= +Verify nested signedXml > True : +sg4j+LFYSzu6ZSzp2Jrh7CxLATJlNH/KTEQlXcfmtM=FBB/YzsLszo0rDe8Mvb1s8JbHxNm59IEVdU8q+rkKa13lsXuSiuSDq/Cw3C3RW3VFy5nJJiOVbCQ6FwHSGhY4vSa3fgohWIPDYKFDTzToxuqrX2W5wsjnl26DiHpBCkWjpGJqEWD6VH9yLWBgo+5ltRLVJRLMoGPj+9/EmjFY/4=puYEL9d9TeBL7MbOia9vcx3qOeyBRiciAwi4MxsjAoI=sbNtaEdIQUxdzJG+ihGnJD9+03JjcKhcG1rRdL2dNA0FhUmSY3D0yT58UNTDOWZ1482op1ixGqLcMhtFs1+PyxoQsA0++YndIf8biE5L+gzktyx6j4d3LtbxujHtT3+HxcEvOOjOXsk2jaTngCJMTrX0Ig3PaF39l/RSok6xVME= diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore80.txt b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore100.txt similarity index 50% rename from root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore80.txt rename to root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore100.txt index 7d777e3c3..48a9fcc70 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore80.txt +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/ResultCore100.txt @@ -1,14 +1,10 @@ HashAlgorithm.Default > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.MD5_CSP > FQ2+bMMhF8fDG0fkIOd9fA== +HashAlgorithm.MD5 > FQ2+bMMhF8fDG0fkIOd9fA== HashAlgorithm.RIPEMD160_M > +2KFDwtYWpBfxsGkJU4SR/6NA8E= -HashAlgorithm.SHA1_CSP > wFTHz2IcQbeEekZ1o41FXOoYqHs= -HashAlgorithm.SHA1_M > wFTHz2IcQbeEekZ1o41FXOoYqHs= -HashAlgorithm.SHA256_CSP > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.SHA256_M > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= -HashAlgorithm.SHA384_CSP > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V -HashAlgorithm.SHA384_M > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V -HashAlgorithm.SHA512_CSP > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== -HashAlgorithm.SHA512_M > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== +HashAlgorithm.SHA1 > wFTHz2IcQbeEekZ1o41FXOoYqHs= +HashAlgorithm.SHA256 > XptEn4IjdI/wfcYTje0ySPKxxLrf91ljtBvpJUiPH2I= +HashAlgorithm.SHA384 > KPANYikTelxukuuiMCaekdQoh5xIm6+Zx4sWY6u/OgAt/cQcWJ1KH89BnggsBm7V +HashAlgorithm.SHA512 > s4KE0QPxsjBiUmkgWFeU3A5w4dF5mvncmWqzYSDvB7CejMOiHBMLaw2220Rmz4NYAf/ReBlafi4jY9UeEkWyZA== KeyedHashAlgorithm.Default > DArKUX/IUh3hLfSP6dRQtpDjO4A= KeyedHashAlgorithm.HMACMD5 > WTofHEUdHAHKlRuNv8hM5Q== KeyedHashAlgorithm.HMACRIPEMD160 > fw9Meric/I6VKV1kw4V3wm8rEUQ= @@ -39,11 +35,11 @@ DSA > PublicKey.Key.ToString(): System.Security.Cryptography.CryptographicExcept privateDSA > is not null ECDsa > X509Certificate2.PrivateKey: is not null ECDsa > SignatureAlgorithm.FriendlyName: sha256ECDSA -ECDsa > PrivateKey.ToString(): System.NotSupportedException, The certificate key algorithm is not supported. +ECDsa > PrivateKey.ToString(): is System.Security.Cryptography.ECDsaCng ECDsa > publicX509Key: is not null ECDsa > SignatureAlgorithm.FriendlyName: sha256ECDSA ECDsa > PublicKey.ToString(): is System.Security.Cryptography.X509Certificates.PublicKey -ECDsa > PublicKey.Key.ToString(): System.NotSupportedException, The certificate key algorithm is not supported. +ECDsa > PublicKey.Key.ToString(): is System.Security.Cryptography.ECDsaCng privateECDsa > is not null publicECDsa > is not null ASymCrypt(X509).Enc&Dec > True @@ -53,7 +49,9 @@ DigitalSignXML.Verify(RS256) > True DigitalSignParam.Verify(DSA-SHA1) > True DigitalSignXML.Verify(DSA-SHA1) > True DigitalSignECDsaX509.Verify(ECDSA-SHA256) > True +DigitalSignParam.Verify(ECDSA-P256) > True DigitalSignECDsaX509.Verify(ECDSA-SHA512) > True +DigitalSignParam.Verify(ECDSA-P521) > True ---------------------------------------------------------------------------------------------------- JWS_HS256.Create > JWS Header: {"alg":"HS256","typ":"JWT"} JWS_HS256.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} @@ -77,31 +75,68 @@ JWS_RS256_X509.Create > JWS Signature: jMJbrOaZ_p0xouAFfetm_orlTuwPbJK65-rEto5lI RSA JWK > {"kty":"RSA","alg":"RS256","n":"nOSgXEBwV-maKTcGlGAFL6KPyTQB7Z0G0Z4ewZi5rhFhEDsZRLV5p3_AqWQQlZFVrIJ_6wdrBY5sCAle6av654jqnI8AqxVV-OL-COmrhVMhrikRXxhxATAzo0Gf_hjW0yux8Ns2HT72PVscjBk9SKeedcorMjWWJPfr1zwsByLaSz8pQApBccRk_bUc-oBHRpDanPFz23v4ts3RXso05G8UZmcaqDqjMsVZfI3Cd3jqaWdb6NeeUw0DZDtMJObOJExJN43LO7rvtWmYXlEgLp-rCTI6CQ0Cmo4WuLU8Rv03fXQXGX0jDNeqfck8EEj7NwJWCvtf_AYaZ6hGcw2PMw","e":"AQAB","kid":"0YKHkdPGFmrVsYp3P52TO1FNiWcKMcgk8s1ddNFD8Ew"} JWS_RS256_X509.Verify > True JWS_RS256_Param.Verify > True +jWS_RS384_XML.Create > JWS Header: {"alg":"RS384","typ":"JWT"} +jWS_RS384_XML.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +jWS_RS384_XML.Create > JWS Signature: shqAjKO-YTBsx6DASpCZW5QtbZWkYC1kYrpZap2eZoNkKVipKekHSnFDoNj3soPMY6hCk5onVOtO9-Ev5_rmJeggEsJ-Vr7JBWRjTc9wRaOmhdXj0wlN_b146TgPTeRTyKeMjeEvp8PiY8hHDKqXHO_b0FeMEwpQU3OBio60AGA +RSA JWK > {"kty":"RSA","alg":"RS384","n":"z0Id6i1UAMLlF8rf5RAtbewG-ncNFFSwK91VXKXqzLPLLK35nxkyQ47zhHXBwtvGcuva3Oe2Nu-xBR33nKrzXPuLb9lvW6T3MnIMU57RyXSKM-nRWWUfgXNrD_r7sa7U5keBjt0l03zVLNRuoPAB9niY2D2N2GH0GMvijRUygq0","e":"AQAB","kid":"dP-zVYRWaQmRfFH2bLdBearWhgmgd3AO4vxdv34FyDN8stXCtz4le8cY1NDYfq7U"} +JWS_RS384_XML.Verify > True +JWS_RS384_Param.Verify > True +JWS_RS512_X509.Create > JWS Header: {"alg":"RS512","typ":"JWT"} +JWS_RS512_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_RS512_X509.Create > JWS Signature: Hu7kkEBidhzIDOT-GDElTyZutarV9q5K29say3_dNNTTkK1QV13r_0wfEg-g52mOXgBHtM0ITiUMz3KkB71RYk6_Ga7GXCxQQGJ-v_aI-49N4pnCZ9CLEehiaZ-76XDSS3VrOlhYEGxGznACMyAF6maxvkJF2kANTTKYk7Z-EZ6T90lD-6C5lOy3h_CEx_WzUoLD2u_4oa2apNFEtMtbRYI50gq4gUSFjFmh2lnm-_xvgLYbruM5Q7VJK5c_8uCu39SetNanCnAps816Ve2JqCRd6XfMQgfsl1Uc4iC26B51dUmR-SXCpOMmlJ3vKC5gFFmX7aY5iaqEKaiR2JAgLA +RSA JWK > {"kty":"RSA","alg":"RS512","n":"nOSgXEBwV-maKTcGlGAFL6KPyTQB7Z0G0Z4ewZi5rhFhEDsZRLV5p3_AqWQQlZFVrIJ_6wdrBY5sCAle6av654jqnI8AqxVV-OL-COmrhVMhrikRXxhxATAzo0Gf_hjW0yux8Ns2HT72PVscjBk9SKeedcorMjWWJPfr1zwsByLaSz8pQApBccRk_bUc-oBHRpDanPFz23v4ts3RXso05G8UZmcaqDqjMsVZfI3Cd3jqaWdb6NeeUw0DZDtMJObOJExJN43LO7rvtWmYXlEgLp-rCTI6CQ0Cmo4WuLU8Rv03fXQXGX0jDNeqfck8EEj7NwJWCvtf_AYaZ6hGcw2PMw","e":"AQAB","kid":"w8oMM75dlmuzJhKJmh8lS3VtmPxuWPxFk6SlZ0BGOdcE67qkeIDNhHwc1ZDO8_sfqNxBxBXSS6MU96wFO6J_Iw"} +JWS_RS512_X509.Verify > True +JWS_RS512_Param.Verify > True JWS_ES256_X509.Create > JWS Header: {"alg":"ES256","typ":"JWT"} JWS_ES256_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JWS_ES256_X509.Create > JWS Signature: Fyv9jcw2W1vKJTziF-uN6g_UfuOrmoIQyyp0ekM3iB85LOys_pskL3gF2ecvaAVK15QOP8P8VROaPuoCf07gTQ +JWS_ES256_X509.Create > JWS Signature: FdhyZVwp5zW2SDL72d6yIdtJCSPwnfduiyWYL9XvzyFNrLl8pfdDuY2jR6RT41SRvX8ukbowAzSZJrxK0D35RQ ECDSA JWK > {"kty":"EC","alg":"ES256","crv":"P-256","x":"qdS3bsts3UXi5p0G71GofUB9ls1fJz_z0dRQw9RZ99A","y":"hX6HISTIiDLt90VDEqGmsMj2kSlGLOcXgXSqz75EhV4","kid":"asm1SGqVczG7zj0saZPKiggv2xwRlb6c23CDCNBqBNA"} JWS_ES256_X509.Verify > True -JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.Fyv9jcw2W1vKJTziF-uN6g_UfuOrmoIQyyp0ekM3iB85LOys_pskL3gF2ecvaAVK15QOP8P8VROaPuoCf07gTQ +JWS_ES256_Param.Verify > True +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.FdhyZVwp5zW2SDL72d6yIdtJCSPwnfduiyWYL9XvzyFNrLl8pfdDuY2jR6RT41SRvX8ukbowAzSZJrxK0D35RQ JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES256","typ":"JWT"} JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.xLibTest > JWS Signature: Fyv9jcw2W1vKJTziF-uN6g_UfuOrmoIQyyp0ekM3iB85LOys_pskL3gF2ecvaAVK15QOP8P8VROaPuoCf07gTQ +JwsAlgorithm.xLibTest > JWS Signature: FdhyZVwp5zW2SDL72d6yIdtJCSPwnfduiyWYL9XvzyFNrLl8pfdDuY2jR6RT41SRvX8ukbowAzSZJrxK0D35RQ +JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES384_X509.Create > JWS Header: {"alg":"ES384","typ":"JWT"} +JWS_ES384_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES384_X509.Create > JWS Signature: Y4rg0Z_1ew7Ih3bV1CENag45BWA221TjHAMkY1YSILgWs7e4wnEPq10PnEwIDWOah2sqd_98D1D5KV9tcZ5sMRfZRfuWC7WBvtza9lFrF1A4ZjAzZZ2hJu4WOJWSJqRH +JWS_ES384_X509.Verify > True +ECDSA JWK > {"kty":"EC","alg":"ES384","crv":"P-384","x":"qeyd2iMw8DZT7Yy3KO0mOuok1JBBdMwEuJTa81Upg06fbVbotK8yuhDSVkzSFsw3","y":"thH6faasSDmEO4zeVNdc5LbZJprQmL7JN3NZzYUJmF1GhQEl6QaZh-6f1QhDH0St","kid":"e_kI1ZJ_x9ttzEU_DICgGhJeNK8ghcW3bSl7KFM6eVefpKJHA5ecCowzJw69r9Vr"} +JWS_ES384_X509.Verify > True +JWS_ES384_Param.Verify > False +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzM4NCIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.Y4rg0Z_1ew7Ih3bV1CENag45BWA221TjHAMkY1YSILgWs7e4wnEPq10PnEwIDWOah2sqd_98D1D5KV9tcZ5sMRfZRfuWC7WBvtza9lFrF1A4ZjAzZZ2hJu4WOJWSJqRH +JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES384","typ":"JWT"} +JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.xLibTest > JWS Signature: Y4rg0Z_1ew7Ih3bV1CENag45BWA221TjHAMkY1YSILgWs7e4wnEPq10PnEwIDWOah2sqd_98D1D5KV9tcZ5sMRfZRfuWC7WBvtza9lFrF1A4ZjAzZZ2hJu4WOJWSJqRH +JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES512_X509.Create > JWS Header: {"alg":"ES512","typ":"JWT"} +JWS_ES512_X509.Create > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JWS_ES512_X509.Create > JWS Signature: AZnwnyNqkpF1QoU0Iu2eiEQRMI6O-YMMrJXLe8k26w-1uGEx2tLQZr0DLt2IRfML9SbklhlwDAOAqlXJZLZ0-20RAeIsiyHBOJChGktYKsTvQcEicVofispEUHYtiV7eVYeHF_FY07rkw08h3dqq2vdj0XhchQkbgrTAz5CCSPXyBj8F +JWS_ES512_X509.Verify > True +ECDSA JWK > {"kty":"EC","alg":"ES512","crv":"P-521","x":"AQoRdSDzXLfin6CFhLxDOL0_Cfn-QcwgdbMkMGgwTeA4gDIygCOEy4m0eyTmEnjYdBOMN5JtYUiprdZZriAGzrHC","y":"ATj5JBej9ztfsArJLUMCs4edyCgPuItefh7KFGfeefI7YjB-pakcKxzhHZ1h2UhR183bnQ4rrXc71N5WAl3d5BqZ","kid":"OaO51pUD4-aJ8skED2eag0nvd1kfqIwo9BhB86PEZ34PBLE4TiHv6v9LCK20r0c6x06bULLSi84PcldSN2n6DQ"} +JWS_ES512_X509.Verify > True +JWS_ES512_Param.Verify > False +JwsAlgorithm.xLibTest > Original:eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.AZnwnyNqkpF1QoU0Iu2eiEQRMI6O-YMMrJXLe8k26w-1uGEx2tLQZr0DLt2IRfML9SbklhlwDAOAqlXJZLZ0-20RAeIsiyHBOJChGktYKsTvQcEicVofispEUHYtiV7eVYeHF_FY07rkw08h3dqq2vdj0XhchQkbgrTAz5CCSPXyBj8F +JwsAlgorithm.xLibTest > JWS Header: {"alg":"ES512","typ":"JWT"} +JwsAlgorithm.xLibTest > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} +JwsAlgorithm.xLibTest > JWS Signature: AZnwnyNqkpF1QoU0Iu2eiEQRMI6O-YMMrJXLe8k26w-1uGEx2tLQZr0DLt2IRfML9SbklhlwDAOAqlXJZLZ0-20RAeIsiyHBOJChGktYKsTvQcEicVofispEUHYtiV7eVYeHF_FY07rkw08h3dqq2vdj0XhchQkbgrTAz5CCSPXyBj8F JwsAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JWE_RsaOaepAesGcm_X509.Decrypt > True : {"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ0eXAiOiJKV1QifQ.EYM45OpjA1CIDl9msdE28l3k-jcU5d_NulYb1Hd8_8HJ3mYDxUiucijTVczvjZjxNtWgaoaf9xBr2qTXobhesCLx6__l228o3BSg-z28uTuIJUN1J-z0qK3Hf8QNAIuxdS4CGWJ6EDh2uLFf0db6r9X-pCveQl9U1gile9ePkFc77aIOgWvsshWHH3EENalWYKgs4Kb8Rsj4BwlVgNxW5W-Dpk1qK0gsAwT0Am04HgGwOLf3QOmTTWKhWl0Sxql0pwPPaUvnlonC6udlPRD9IxKZ16j_U-klbSQAOjJl9NYO0mUfGHbVmUHU1REehkp_aHZ6DBlbkw70QBX2_AV7Rw.MvTbXkLS2NzReGfz.TEBHaPkHPQKmnW5Pq9Qju0FtWkEhE3woyfEQHFdBIiLtNC3VU1REtoPCTA.hA950PHb4AnAxbmm4PQOVA +JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00iLCJ0eXAiOiJKV1QifQ.edcrJWqKOfY080tAusvFJzuprNKTeaw7YILvAyDw_909i5aQ16CK6yuZs2tXd_pRp4UON05_jCNSBwOz-qkMptTjO9UX4B0Ln4LN4UUK-44bPdHWsQHA4-T0OyOHtEcemqElnuWGVL32i6-FmA1hA70OvxzF_DKB6JD65bPV4scfwcaAILySeVzq2Efg3y-6Qu5hOySeT8RLhEH1NAxisTI1jWi5-jIpYHlcRBm5LH25YXiyouc3zxaoZ_8g5dC2D6TTP40CdZBV8IO505FvINHqo6cli7LznVcDjR6AVtsPoBXsuP63GtJA-NCCDSAZ5G8YG3SvZ6LBDO035YClyw.tAX-0ka-sV93KBtw.dRlMYVJtyFL-8JjUiv32PPaE58UGkCnTAFIEAO12ZXSOoqiTS5RG74JRHg.oUbGIhaiV9ohBEMIfuoUWg JweAlgorithm.xLibTest > JWE Header: {"alg":"RSA-OAEP","enc":"A256GCM","typ":"JWT"} -JweAlgorithm.xLibTest > JWE Encrypted Key: EYM45OpjA1CIDl9msdE28l3k-jcU5d_NulYb1Hd8_8HJ3mYDxUiucijTVczvjZjxNtWgaoaf9xBr2qTXobhesCLx6__l228o3BSg-z28uTuIJUN1J-z0qK3Hf8QNAIuxdS4CGWJ6EDh2uLFf0db6r9X-pCveQl9U1gile9ePkFc77aIOgWvsshWHH3EENalWYKgs4Kb8Rsj4BwlVgNxW5W-Dpk1qK0gsAwT0Am04HgGwOLf3QOmTTWKhWl0Sxql0pwPPaUvnlonC6udlPRD9IxKZ16j_U-klbSQAOjJl9NYO0mUfGHbVmUHU1REehkp_aHZ6DBlbkw70QBX2_AV7Rw -JweAlgorithm.xLibTest > JWE Initialization Vector: MvTbXkLS2NzReGfz -JweAlgorithm.xLibTest > JWE Ciphertext: TEBHaPkHPQKmnW5Pq9Qju0FtWkEhE3woyfEQHFdBIiLtNC3VU1REtoPCTA -JweAlgorithm.xLibTest > JWE Authentication Tag: hA950PHb4AnAxbmm4PQOVA +JweAlgorithm.xLibTest > JWE Encrypted Key: edcrJWqKOfY080tAusvFJzuprNKTeaw7YILvAyDw_909i5aQ16CK6yuZs2tXd_pRp4UON05_jCNSBwOz-qkMptTjO9UX4B0Ln4LN4UUK-44bPdHWsQHA4-T0OyOHtEcemqElnuWGVL32i6-FmA1hA70OvxzF_DKB6JD65bPV4scfwcaAILySeVzq2Efg3y-6Qu5hOySeT8RLhEH1NAxisTI1jWi5-jIpYHlcRBm5LH25YXiyouc3zxaoZ_8g5dC2D6TTP40CdZBV8IO505FvINHqo6cli7LznVcDjR6AVtsPoBXsuP63GtJA-NCCDSAZ5G8YG3SvZ6LBDO035YClyw +JweAlgorithm.xLibTest > JWE Initialization Vector: tAX-0ka-sV93KBtw +JweAlgorithm.xLibTest > JWE Ciphertext: dRlMYVJtyFL-8JjUiv32PPaE58UGkCnTAFIEAO12ZXSOoqiTS5RG74JRHg +JweAlgorithm.xLibTest > JWE Authentication Tag: oUbGIhaiV9ohBEMIfuoUWg JweAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JWE_Rsa15A128CbcHS256_X509.Decrypt > True : {"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwidHlwIjoiSldUIn0.kdM-dDKBHYH_jQk05LELKOcayQSC5fzImZwYxOePTiJlkZdQJgKqqsaDwWcM_eBz5ZhtdM4GDJmIzlSvcTwXLK7R7uLl00SpIdhzmus64qk75GgsuxYI-9St3zeNzrFhm5FGt7RumKATt8H1A6L5FBhHlYiMp21rk6p7betJD044R-RnKJpNDa9ZUUrG0xylpjF0g4gmZk1nW_Ew6bi7IBzeo4FtdNXDYtjIXKbga7GgeBSH-4vFyYZz9PcL0EiLHX19puKI53sgxCmMLbYkUoAsaNK2Mia9fpjSRfUmxzWscvhKotRhZjB_ftRn_BRBe9HFEycBMBFU9-c6ONTkaw.kHl2wSHGqXMfWj4g3Cixyg.mxXurzA-Jaw9hqgQqJ3fvxrWmVNBQKjjAJ4pkGBBoW-imWqclXcX3YczDT94NhZ8.0kdXBfURhu8uMYgH8T0STg +JweAlgorithm.xLibTest > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwidHlwIjoiSldUIn0.MtulbY_m_n7EnWKU2JtGFuZhuoz060YvMHGDo7rLsXziHN0rtVQKKbCHzWd9Z3bp_rSr99YeeVaDcJSw0dPKJ9Kwt9g5vdqVHin7exOUmFRH3ELlwL26xKQFyV_Dvx1zmMHiYC4fBJ8lpruojg2Sp3hafdZKKyEDIf7wdOodQITH8oTLl63pwALqGUCxY7BikQgBMnaR74DfbvlfZaGwuqW3_IEonL-wFORjYN7PMEMMhBv3BVXNuJX50TgEU1irazHslIqDvRKNpnXJnCvZYMQHWLZLii1QLkXKNtsm712D8wki0cVT8P3Eeu9EuXX1ndmu6K30jesksmUZzthfUw.C2rFKhxUYzz3UKPKznOBmg.nJ8T8e6NYk5C14Yy1HoIDslMg9mAUuP-FgB-wOXvQ-Pgy4r1wJ80gVa0OgJnpDRO.ua5QHzHyKDD7UwqlxBZkpg JweAlgorithm.xLibTest > JWE Header: {"alg":"RSA1_5","enc":"A128CBC-HS256","typ":"JWT"} -JweAlgorithm.xLibTest > JWE Encrypted Key: kdM-dDKBHYH_jQk05LELKOcayQSC5fzImZwYxOePTiJlkZdQJgKqqsaDwWcM_eBz5ZhtdM4GDJmIzlSvcTwXLK7R7uLl00SpIdhzmus64qk75GgsuxYI-9St3zeNzrFhm5FGt7RumKATt8H1A6L5FBhHlYiMp21rk6p7betJD044R-RnKJpNDa9ZUUrG0xylpjF0g4gmZk1nW_Ew6bi7IBzeo4FtdNXDYtjIXKbga7GgeBSH-4vFyYZz9PcL0EiLHX19puKI53sgxCmMLbYkUoAsaNK2Mia9fpjSRfUmxzWscvhKotRhZjB_ftRn_BRBe9HFEycBMBFU9-c6ONTkaw -JweAlgorithm.xLibTest > JWE Initialization Vector: kHl2wSHGqXMfWj4g3Cixyg -JweAlgorithm.xLibTest > JWE Ciphertext: mxXurzA-Jaw9hqgQqJ3fvxrWmVNBQKjjAJ4pkGBBoW-imWqclXcX3YczDT94NhZ8 -JweAlgorithm.xLibTest > JWE Authentication Tag: 0kdXBfURhu8uMYgH8T0STg +JweAlgorithm.xLibTest > JWE Encrypted Key: MtulbY_m_n7EnWKU2JtGFuZhuoz060YvMHGDo7rLsXziHN0rtVQKKbCHzWd9Z3bp_rSr99YeeVaDcJSw0dPKJ9Kwt9g5vdqVHin7exOUmFRH3ELlwL26xKQFyV_Dvx1zmMHiYC4fBJ8lpruojg2Sp3hafdZKKyEDIf7wdOodQITH8oTLl63pwALqGUCxY7BikQgBMnaR74DfbvlfZaGwuqW3_IEonL-wFORjYN7PMEMMhBv3BVXNuJX50TgEU1irazHslIqDvRKNpnXJnCvZYMQHWLZLii1QLkXKNtsm712D8wki0cVT8P3Eeu9EuXX1ndmu6K30jesksmUZzthfUw +JweAlgorithm.xLibTest > JWE Initialization Vector: C2rFKhxUYzz3UKPKznOBmg +JweAlgorithm.xLibTest > JWE Ciphertext: nJ8T8e6NYk5C14Yy1HoIDslMg9mAUuP-FgB-wOXvQ-Pgy4r1wJ80gVa0OgJnpDRO +JweAlgorithm.xLibTest > JWE Authentication Tag: ua5QHzHyKDD7UwqlxBZkpg JweAlgorithm.xLibTest > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} JwsAlgorithm.none > eyJhbGciOiJub25lIiwidHlwIjoiSldUIn0.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ. JwsAlgorithm.HS256 > Original:eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.dvd5Ak6zcBy0OB7gxVtehT3Ab5NO7XEggon6r_CTSfE @@ -114,64 +149,64 @@ JwsAlgorithm.RS256 > JWS Header: {"alg":"RS256","typ":"JWT"} JwsAlgorithm.RS256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} JwsAlgorithm.RS256 > JWS Signature: jMJbrOaZ_p0xouAFfetm_orlTuwPbJK65-rEto5lIGgCR_oCG_ApQWeCXc5xikto_IcN2nNsHWMOMJMII6WlhVmn9pFTuuj-fZH_aB-aasDSguyXd59BA43a4glZbPCITOwZFfeNMpXGrKG_YNvexP5mtiJYYCDXMgq2zBHS9lQYcGXy4YyGPD_jNu6ziLRNDdKCkRqTppTE2SexZAwaSJRGGuY-fHA3jVPBV90Cty7yBC3ybKmiE4imVQs8CUw7ic61HSytgItIlreol4PMMP8fXB6O1e_K8QJFfRIf9oC07y9Mo5OWl4CCOxvKAo9nos0GTWUUNUH-sugJhUV14A JwsAlgorithm.RS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.KTAUErvBUw2XLJxF3ZigZ9gPAgodYiBIHT0oVqpH3xviHmmBYpSyMFt3czk0ko6uyKYC2jwd8ouep_RWw0hlJw +JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.6TPKtvEBm2VHxGa_9fexyxV7_AfAz-eyJORBoxJdy2oI7viElhe_deqp8lM-15lAZmmJU9iIm7u7ykztquH2sQ JwsAlgorithm.ES256 > JWS Header: {"alg":"ES256","typ":"JWT"} JwsAlgorithm.ES256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > JWS Signature: KTAUErvBUw2XLJxF3ZigZ9gPAgodYiBIHT0oVqpH3xviHmmBYpSyMFt3czk0ko6uyKYC2jwd8ouep_RWw0hlJw +JwsAlgorithm.ES256 > JWS Signature: 6TPKtvEBm2VHxGa_9fexyxV7_AfAz-eyJORBoxJdy2oI7viElhe_deqp8lM-15lAZmmJU9iIm7u7ykztquH2sQ JwsAlgorithm.ES256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.vU0iK5JPIqGGS2iv7dGpWFjwI0AtsGSRNLSMhR8DmUR4y4Rlnqdgv-k-Z9Hm0CRCRs6a3yhqVn_bg_sckDX6uw +JwsAlgorithm.ES256 > Original:eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.GeRBw5SiQhVB1chhNwVA-xMKmWr6YGkfEY6VTWGGRUGQLmlqpTV6G85v_aJRvw6ob-yVbhZvPmqXJwUtayRalA JwsAlgorithm.ES256 > JWS Header: {"alg":"ES256","typ":"JWT"} JwsAlgorithm.ES256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":1300819380} -JwsAlgorithm.ES256 > JWS Signature: vU0iK5JPIqGGS2iv7dGpWFjwI0AtsGSRNLSMhR8DmUR4y4Rlnqdgv-k-Z9Hm0CRCRs6a3yhqVn_bg_sckDX6uw +JwsAlgorithm.ES256 > JWS Signature: GeRBw5SiQhVB1chhNwVA-xMKmWr6YGkfEY6VTWGGRUGQLmlqpTV6G85v_aJRvw6ob-yVbhZvPmqXJwUtayRalA JwsAlgorithm.ES256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0.Edk8i1823XOErH2TVwJj4AC983LV9oKTVthPc8JB9fzYPJa3g-ev6FYZCV6KA0I45aHFGwMUDnMDfci_6Lf4gNmbKw-PdEnHchBbuiz3r_Qno52GftKd8kzrSdAXAflApD2Z2X9lu9FcAf8UrV_FzenwXaeouxZ_osG4X_-9Oe-0KOgNUsGGBvraDovprN5yz44dJ620m1F0x5BPLckuWCTu-uDfqV0muI6aHdJPGgRN30fpkaPemQdBvEEWpelvRHcOfeVWLX3k9vBTLAlZDf_yc-avxdR9Mk49MX5gutx48Ia9VoPpGaoEktAPWw-1ljyzh8OLrD5nXTcB-wOy8w.pxkevZZmZSHevitPcldmjw.JwC1SrD2Wup-ssxIXsmjiQKIu6YBXHbPEc_Ri8v9qgtzSdY3yPQ7bB30LA_VqBW8.e4Zk6AhfW0MNZi0AgozYPA +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJSU0ExXzUiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0.kKCM3QOB7PjZXcQmL3XE3HKb2LPsn_HAXS3GpW9t2yrh6frqciP4MHr8S5S9O0BkZlWzf7fUivZ2auyNow7fuBGynihTn9vVOCMKI12k_LCkdnMdgE52rxnr_tfdhqGlikNQvPIiWLxa1q43ywnFvdZvmx5VaRZzCDFyJm9pL1F0e_iXdz4hzybOuOOXN5fQ3hih7PJmtRyos1CEa86wegiTD6BeYIbJgajWuUMw7jLAPllLzbD4m1s-FCCowZyni53HxLCercOu4Oc3t-jzTYZju_apELrPJ7y0RYPcTzU4TSnuEoTtznYUw1Ls-_ceztoNt5j3Mxp-FMIhFXnZPw.GN3QJ5vAsUq3T5XNzLhuWg.DgxbAehLvwTYErc9-wzpeAnND6hVMuAndrmwyKMaIFHnNoEupw471xHGonsdZt-c.S6y4xWqM7OwMfuO66MlM-A JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Header: {"alg":"RSA1_5","enc":"A128CBC-HS256"} -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: Edk8i1823XOErH2TVwJj4AC983LV9oKTVthPc8JB9fzYPJa3g-ev6FYZCV6KA0I45aHFGwMUDnMDfci_6Lf4gNmbKw-PdEnHchBbuiz3r_Qno52GftKd8kzrSdAXAflApD2Z2X9lu9FcAf8UrV_FzenwXaeouxZ_osG4X_-9Oe-0KOgNUsGGBvraDovprN5yz44dJ620m1F0x5BPLckuWCTu-uDfqV0muI6aHdJPGgRN30fpkaPemQdBvEEWpelvRHcOfeVWLX3k9vBTLAlZDf_yc-avxdR9Mk49MX5gutx48Ia9VoPpGaoEktAPWw-1ljyzh8OLrD5nXTcB-wOy8w -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: pxkevZZmZSHevitPcldmjw -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Ciphertext: JwC1SrD2Wup-ssxIXsmjiQKIu6YBXHbPEc_Ri8v9qgtzSdY3yPQ7bB30LA_VqBW8 -JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: e4Zk6AhfW0MNZi0AgozYPA +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: kKCM3QOB7PjZXcQmL3XE3HKb2LPsn_HAXS3GpW9t2yrh6frqciP4MHr8S5S9O0BkZlWzf7fUivZ2auyNow7fuBGynihTn9vVOCMKI12k_LCkdnMdgE52rxnr_tfdhqGlikNQvPIiWLxa1q43ywnFvdZvmx5VaRZzCDFyJm9pL1F0e_iXdz4hzybOuOOXN5fQ3hih7PJmtRyos1CEa86wegiTD6BeYIbJgajWuUMw7jLAPllLzbD4m1s-FCCowZyni53HxLCercOu4Oc3t-jzTYZju_apELrPJ7y0RYPcTzU4TSnuEoTtznYUw1Ls-_ceztoNt5j3Mxp-FMIhFXnZPw +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: GN3QJ5vAsUq3T5XNzLhuWg +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Ciphertext: DgxbAehLvwTYErc9-wzpeAnND6hVMuAndrmwyKMaIFHnNoEupw471xHGonsdZt-c +JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: S6y4xWqM7OwMfuO66MlM-A JweAlgorithm.RSA1_5, JweEncryption.A128CBC_HS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ.E5ihdC05udtIfqa6irK6tcQmr6O0f89eNtwBjL1zfbrogKus3i7v431KmrLm4zS2ZzYJ81ZiLWuFsOhKbOrIzaceirR7cFSl5Vd4O1PFSqsrwwSjNMEMoUULxqR_C3lArGJqb6v3sPKmTIAEHKxlC1Hs7P58tbs3MBThd-ckBYad2fHunHrJITJSQoKI1s11UIIdkE9onXxeJvr_wQcv6TlbRJll5L9epm3G5xGjr9RklAjxN6kAvsNxQDSkUU8L4ngJ4WjjAsE85YoFaozj_vIEgFCp7no78lVs-qM4zjCXstRv5t4e41NQ-MmdIgWXi9XjbY72f7BHzaGxLrmenA._Z2rncIdLzQlMMv8.1xjqnXKzHLVa0nBPCVNH8Ui265b9uVkvXHTBv89iSZlJaB66ek8Mu9iJhA.lFbb1QDD6IND8EpFaaUrYw +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Original:eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkEyNTZHQ00ifQ.GnmWpfccMRweSdfgnpiEwlhmEAqGMDnwMG4RryLDoHS3SkhhOJ-FVeMUVUoeuIEsXbR_Ea5qg7p9TziXaH8EwiQcClkAkgdn0Fmo51IQ2CoRnleGbF9ysq7Ppr5urPozDvBO9mDrIbAwBY4Q0OVlVio7VUo5sg7UVkM42aR3M7k-KJdyoJLQsHkF6skSyLnajNs9Gc5iozXmK5fpcYqTVhgl0PdazntTxQuvN1ileg5yORvveQ-0zOR4oa0udyJULTeAjWhEfYEopLihNAnGGWj7P_GdvnGCw9W_Y8OMXnR3GJw76l82sWdB53KZlNLtjXWJo37oKQjnWuvjcqtpEw.A2aMGxvBXSlRNG9C.s4J3soaCmwKTJzR2KsxOIuvT5Bj4fevMCtQ6ky4tNB7ZJzqW8HH1hP3qbA.ha1fZH4ofYZlGxYMBf1Xaw JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Header: {"alg":"RSA-OAEP","enc":"A256GCM"} -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Encrypted Key: E5ihdC05udtIfqa6irK6tcQmr6O0f89eNtwBjL1zfbrogKus3i7v431KmrLm4zS2ZzYJ81ZiLWuFsOhKbOrIzaceirR7cFSl5Vd4O1PFSqsrwwSjNMEMoUULxqR_C3lArGJqb6v3sPKmTIAEHKxlC1Hs7P58tbs3MBThd-ckBYad2fHunHrJITJSQoKI1s11UIIdkE9onXxeJvr_wQcv6TlbRJll5L9epm3G5xGjr9RklAjxN6kAvsNxQDSkUU8L4ngJ4WjjAsE85YoFaozj_vIEgFCp7no78lVs-qM4zjCXstRv5t4e41NQ-MmdIgWXi9XjbY72f7BHzaGxLrmenA -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Initialization Vector: _Z2rncIdLzQlMMv8 -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Ciphertext: 1xjqnXKzHLVa0nBPCVNH8Ui265b9uVkvXHTBv89iSZlJaB66ek8Mu9iJhA -JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Authentication Tag: lFbb1QDD6IND8EpFaaUrYw +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Encrypted Key: GnmWpfccMRweSdfgnpiEwlhmEAqGMDnwMG4RryLDoHS3SkhhOJ-FVeMUVUoeuIEsXbR_Ea5qg7p9TziXaH8EwiQcClkAkgdn0Fmo51IQ2CoRnleGbF9ysq7Ppr5urPozDvBO9mDrIbAwBY4Q0OVlVio7VUo5sg7UVkM42aR3M7k-KJdyoJLQsHkF6skSyLnajNs9Gc5iozXmK5fpcYqTVhgl0PdazntTxQuvN1ileg5yORvveQ-0zOR4oa0udyJULTeAjWhEfYEopLihNAnGGWj7P_GdvnGCw9W_Y8OMXnR3GJw76l82sWdB53KZlNLtjXWJo37oKQjnWuvjcqtpEw +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Initialization Vector: A2aMGxvBXSlRNG9C +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Ciphertext: s4J3soaCmwKTJzR2KsxOIuvT5Bj4fevMCtQ6ky4tNB7ZJzqW8HH1hP3qbA +JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > JWE Authentication Tag: ha1fZH4ofYZlGxYMBf1Xaw JweAlgorithm.RSA_OAEP, JweEncryption.A256GCM > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..KuUnyTvq9fXJtDzMIS840g.UBPmH3nqn6DpQSy1lEOqxB0i6HxH0Tq9ESCuqaTx_V9yWZS_XnACL7OyaH_deEPx.dsw_ayMmiUeCKOKskAPrYw +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Original:eyJhbGciOiJkaXIiLCJlbmMiOiJBMTI4Q0JDLUhTMjU2In0..QVrifvtI6I5Ooo9TD4zhXA.Fi6y6jUXoIhF-ewFpjpunvykW32AuSsg19ucWGcKBe41s7mlurF_YrS9-xEkyjkq.nkhS-2r8JYDiWAnwKg3inQ JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Header: {"alg":"dir","enc":"A128CBC-HS256"} JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Encrypted Key: -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: KuUnyTvq9fXJtDzMIS840g -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Ciphertext: UBPmH3nqn6DpQSy1lEOqxB0i6HxH0Tq9ESCuqaTx_V9yWZS_XnACL7OyaH_deEPx -JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: dsw_ayMmiUeCKOKskAPrYw +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Initialization Vector: QVrifvtI6I5Ooo9TD4zhXA +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Ciphertext: Fi6y6jUXoIhF-ewFpjpunvykW32AuSsg19ucWGcKBe41s7mlurF_YrS9-xEkyjkq +JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > JWE Authentication Tag: nkhS-2r8JYDiWAnwKg3inQ JweAlgorithm.DIR, JweEncryption.A128CBC_HS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.2HDF0yPCy1TdHl7xTb2e_DdZRkOhKPf02gyAYEyLXnycIXU5uEvEeDp9vVEQkKb2XqkObItcxfx-3Hk9_RtD9SMOoIiF04VE.rf5OlDNLEKwv-zeVTtPUsw.Fh7qHotBkViUQixw1hbkE0qGfkh1zb7pZyXJyCbTPYNZo_RSZZXrqTB7AL1evHrX.CkrEoZyQxLqOm3cx65M4o0U8XGM36Lt_I_3CxkfWMw0 +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2S1ciLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.I53ooLjzbWEV1c5y53IPg_J18hmJY7MXT_tdTPmJwqP1qZrM0xGiE-Z-V8X_nPpuRYgTfn184cmkaZ7n_dyzejPha9mWLRaM.zuo1PwH-b-c0plvEFtUMBg.bDmhsw1maPd2n3rBNqGqLJOBtWvpjZwyeHQIVO7roT08oweVA22XxCZOy4rpgeNC.4Bcb4-P2IayzjV4lKOkLGFZJ_4W-wO_f3ic2hIirZIw JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256KW","enc":"A256CBC-HS512"} -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: 2HDF0yPCy1TdHl7xTb2e_DdZRkOhKPf02gyAYEyLXnycIXU5uEvEeDp9vVEQkKb2XqkObItcxfx-3Hk9_RtD9SMOoIiF04VE -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: rf5OlDNLEKwv-zeVTtPUsw -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: Fh7qHotBkViUQixw1hbkE0qGfkh1zb7pZyXJyCbTPYNZo_RSZZXrqTB7AL1evHrX -JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: CkrEoZyQxLqOm3cx65M4o0U8XGM36Lt_I_3CxkfWMw0 +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: I53ooLjzbWEV1c5y53IPg_J18hmJY7MXT_tdTPmJwqP1qZrM0xGiE-Z-V8X_nPpuRYgTfn184cmkaZ7n_dyzejPha9mWLRaM +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: zuo1PwH-b-c0plvEFtUMBg +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: bDmhsw1maPd2n3rBNqGqLJOBtWvpjZwyeHQIVO7roT08oweVA22XxCZOy4rpgeNC +JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: 4Bcb4-P2IayzjV4lKOkLGFZJ_4W-wO_f3ic2hIirZIw JweAlgorithm.A256KW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2R0NNS1ciLCJpdiI6ImVrTmp6SldzcG8zeEJMTzciLCJ0YWciOiJEUjlDM3ZfeF9nX1JyYlg2RG9nTGtRIiwiZW5jIjoiQTI1NkNCQy1IUzUxMiJ9.fRpim0sP51LZoVDxoGWjNtFLJ3fT0SgJO_RP6Lvxf3NTv-RHSUc0scPYoeQVOOcqqHkilpbV81Gm8MIbwTlV2A.F6uKq-z-UguEDYL6JIwrzQ.VkvcSNYyBbWxNZGqAhwE4BfQ8wwbOS6WVXRsSKgPxkvP4xYEJZYtyb11wXZ09W9x.CgUQVUY3zOzRVnwe2Eq5mETa7ZTyMnFzyBzWcNIQRso -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256GCMKW","iv":"ekNjzJWspo3xBLO7","tag":"DR9C3v_x_g_RrbX6DogLkQ","enc":"A256CBC-HS512"} -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: fRpim0sP51LZoVDxoGWjNtFLJ3fT0SgJO_RP6Lvxf3NTv-RHSUc0scPYoeQVOOcqqHkilpbV81Gm8MIbwTlV2A -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: F6uKq-z-UguEDYL6JIwrzQ -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: VkvcSNYyBbWxNZGqAhwE4BfQ8wwbOS6WVXRsSKgPxkvP4xYEJZYtyb11wXZ09W9x -JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: CgUQVUY3zOzRVnwe2Eq5mETa7ZTyMnFzyBzWcNIQRso +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJBMjU2R0NNS1ciLCJpdiI6IkQ2bUVlLXV3bUw1VEV3dUEiLCJ0YWciOiJOMGRSQV9JUEhhQndjeG9WT3BFYjlBIiwiZW5jIjoiQTI1NkNCQy1IUzUxMiJ9.14yQsB8He2E6eRQTLWaFKyXG6KHtHoWNBswgJfmbDd93g1ioi_ukxXsgo9WSqxme0m-WoVenxSOhZJwk9s6Zrw.6tyAe7zEnsAMIzF_1z_9Nw.sg5995L8QkvHBRoUr4rzNVUhIv-AdNSzgQozFPpAV-9rwbQsrKaO2TJILNGTuKjK.dzRekdA9FNlluMu3hZF9nJWgtxLWWl1gJIUnjMjywJU +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"A256GCMKW","iv":"D6mEe-uwmL5TEwuA","tag":"N0dRA_IPHaBwcxoVOpEb9A","enc":"A256CBC-HS512"} +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: 14yQsB8He2E6eRQTLWaFKyXG6KHtHoWNBswgJfmbDd93g1ioi_ukxXsgo9WSqxme0m-WoVenxSOhZJwk9s6Zrw +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: 6tyAe7zEnsAMIzF_1z_9Nw +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: sg5995L8QkvHBRoUr4rzNVUhIv-AdNSzgQozFPpAV-9rwbQsrKaO2TJILNGTuKjK +JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: dzRekdA9FNlluMu3hZF9nJWgtxLWWl1gJIUnjMjywJU JweAlgorithm.A256GCMKW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > Original:eyJhbGciOiJFQ0RILUVTIiwiZXBrIjp7Imt0eSI6IkVDIiwieCI6IjBxWHhva3p3WFN5aU9ObnA4R01lazU4V1dWODRZOGJtS1ZTSHJPc0xhYkEiLCJ5IjoiZWdZWEtvcG9VWHk5TEhiNXNKeWFIVUhCYnNhUGI4eS1SLW1xZ011Y3ByZyIsImNydiI6IlAtMjU2In0sImVuYyI6IkEyNTZHQ00ifQ..pPnIPIgvgkFe8FKD.4zYS_11E88iZ8ew1X5GRHs3ACPmpKdP2ce-EnH7Lsv0eVHcZNGr4hWoikw.9J2J6jrelNujAq08cIzqLA -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Header: {"alg":"ECDH-ES","epk":{"kty":"EC","x":"0qXxokzwXSyiONnp8GMek58WWV84Y8bmKVSHrOsLabA","y":"egYXKopoUXy9LHb5sJyaHUHBbsaPb8y-R-mqgMucprg","crv":"P-256"},"enc":"A256GCM"} +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > Original:eyJhbGciOiJFQ0RILUVTIiwiZXBrIjp7Imt0eSI6IkVDIiwieCI6IldwbGRSQkJBWktxSktncndpMk56UGplRHdCek1tY09Dd1ZYWUFSb3hqSFUiLCJ5IjoiSUdCRXZXUEtCZEdDQUtoOVc3NVg0bHRXelg0YThJbVR6RW9fb2hlOXVUTSIsImNydiI6IlAtMjU2In0sImVuYyI6IkEyNTZHQ00ifQ..EcC8NIJuuSwfBLOR.u8-_yuTuxDd89ZfP7PumVfgMaqFPJ6Rm5DSfiJZAgSUnEyXg0gHK5HwGwg.g1L4cz-kr2uBf-Tcn_K9cA +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Header: {"alg":"ECDH-ES","epk":{"kty":"EC","x":"WpldRBBAZKqJKgrwi2NzPjeDwBzMmcOCwVXYARoxjHU","y":"IGBEvWPKBdGCAKh9W75X4ltWzX4a8ImTzEo_ohe9uTM","crv":"P-256"},"enc":"A256GCM"} JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Encrypted Key: -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Initialization Vector: pPnIPIgvgkFe8FKD -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Ciphertext: 4zYS_11E88iZ8ew1X5GRHs3ACPmpKdP2ce-EnH7Lsv0eVHcZNGr4hWoikw -JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Authentication Tag: 9J2J6jrelNujAq08cIzqLA +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Initialization Vector: EcC8NIJuuSwfBLOR +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Ciphertext: u8-_yuTuxDd89ZfP7PumVfgMaqFPJ6Rm5DSfiJZAgSUnEyXg0gHK5HwGwg +JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > JWE Authentication Tag: g1L4cz-kr2uBf-Tcn_K9cA JweAlgorithm.ECDH_ES, JweEncryption.A256GCM > System.Security.Cryptography.CryptographicException, キーがありません。 -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJwMmMiOjgxOTIsInAycyI6IlczUzZtWENyOVB4bVd2ejAiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.yppAMIND00fe83U1Fb2-znGrn-JDHMcEc5P6GFXOjuke06BrNWQeibg9kmq7z_ZWJ17BGM1REMuah77vqhm_mq2o_dnTDmp6.qRcKLn1xjTYSlqQJhVK5-Q.3xm9sBkKjkpmPu0Sr5ePWLAVzFH1-keXSKvn6-WRnnNc76wbPBD26MQ1ZlPqaZlT.v_T-UFozujrUpKziEc1qqFx7wVMleg16mq_nmoGiltE -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"PBES2-HS256+A128KW","p2c":8192,"p2s":"W3S6mXCr9PxmWvz0","enc":"A256CBC-HS512"} -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: yppAMIND00fe83U1Fb2-znGrn-JDHMcEc5P6GFXOjuke06BrNWQeibg9kmq7z_ZWJ17BGM1REMuah77vqhm_mq2o_dnTDmp6 -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: qRcKLn1xjTYSlqQJhVK5-Q -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: 3xm9sBkKjkpmPu0Sr5ePWLAVzFH1-keXSKvn6-WRnnNc76wbPBD26MQ1ZlPqaZlT -JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: v_T-UFozujrUpKziEc1qqFx7wVMleg16mq_nmoGiltE +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Original:eyJhbGciOiJQQkVTMi1IUzI1NitBMTI4S1ciLCJwMmMiOjgxOTIsInAycyI6IlJ2VmZvc1Nua0Vxb3FpMFEiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0.3PB8TgWzRJbc__0yLUZ8KFnmFvTJbhNcHm7K523OjNUIDkFRP7nMIn8PQkbWf4eB8sTAArTotqeXSAN8sC8M7TSS_TkRCCAJ.zNB4bHGogG5K3mdQnG7_Rg.TS0HPoeZo6J9pgu6udaXfggeBvN13ppquLXqbF5OqSUbA3H-r69sd0yVN1urTNOF.SOj1Cl58MzoMN3Itu5vzoiotjPS3hudXlZ4XBXYgo8s +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Header: {"alg":"PBES2-HS256+A128KW","p2c":8192,"p2s":"RvVfosSnkEqoqi0Q","enc":"A256CBC-HS512"} +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Encrypted Key: 3PB8TgWzRJbc__0yLUZ8KFnmFvTJbhNcHm7K523OjNUIDkFRP7nMIn8PQkbWf4eB8sTAArTotqeXSAN8sC8M7TSS_TkRCCAJ +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Initialization Vector: zNB4bHGogG5K3mdQnG7_Rg +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Ciphertext: TS0HPoeZo6J9pgu6udaXfggeBvN13ppquLXqbF5OqSUbA3H-r69sd0yVN1urTNOF +JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > JWE Authentication Tag: SOj1Cl58MzoMN3Itu5vzoiotjPS3hudXlZ4XBXYgo8s JweAlgorithm.PBES2_HS256_A128KW, JweEncryption.A256CBC_HS512 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} Adding extra headers to RS256 > Original:eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCIsImN0eSI6IkpXVCIsImtleWlkIjoiMTExLTIyMi0zMzMifQ.eyJzdWIiOiJtci54QGNvbnRvc28uY29tIiwiZXhwIjoxMzAwODE5MzgwfQ.KwtpHrjNKBnyHo6QRaULxcWZDF9mDKHiQG1QBSmnrwHi7vJSiLH_3fFIcTkQvdu7FstmPOuuVD-T3EPKfv61aHz5o-0dRTylooln5tS_2_uZ4lPV4A2C_Pr_cYzRawUIuTwhCi3n0i-fQapYvKT41qjh0vKalEuDmd6-WDnpGcKdI3dv-kSB_42FfIdbEKDEtYvgyzwj5An9YJim29OsiM-GW6tyqei3nzHrQ0yPhgfKOd89M_azGynAVTTNKvPyZujnILu-XnVu54So-5W2fwg-WkKIpvP2ZZFAWRs-DEapBJWrNm10GGZdid-98SmGoifkaDNpCeIcQe3uetDB6w Adding extra headers to RS256 > JWS Header: {"alg":"RS256","typ":"JWT","cty":"JWT","keyid":"111-222-333"} @@ -179,4 +214,4 @@ Adding extra headers to RS256 > JWS Payload: {"sub":"mr.x@contoso.com","exp":130 Adding extra headers to RS256 > JWS Signature: KwtpHrjNKBnyHo6QRaULxcWZDF9mDKHiQG1QBSmnrwHi7vJSiLH_3fFIcTkQvdu7FstmPOuuVD-T3EPKfv61aHz5o-0dRTylooln5tS_2_uZ4lPV4A2C_Pr_cYzRawUIuTwhCi3n0i-fQapYvKT41qjh0vKalEuDmd6-WDnpGcKdI3dv-kSB_42FfIdbEKDEtYvgyzwj5An9YJim29OsiM-GW6tyqei3nzHrQ0yPhgfKOd89M_azGynAVTTNKvPyZujnILu-XnVu54So-5W2fwg-WkKIpvP2ZZFAWRs-DEapBJWrNm10GGZdid-98SmGoifkaDNpCeIcQe3uetDB6w Adding extra headers to RS256 > Decoded:{"sub":"mr.x@contoso.com","exp":1300819380} Strict validation(RS256) > {"sub":"mr.x@contoso.com","exp":1300819380} -Verify nested signedXml > True : +sg4j+LFYSzu6ZSzp2Jrh7CxLATJlNH/KTEQlXcfmtM=almLl/j6yPjcRYY4MrqbPtmfGJRT/caGPHRr3w5n1y7yodg9zYmxVWQrYecufWHVT9Y7GgBRwA0AreUJkGsrebsCJheHdN6xNNvHQ6S85xS5UbEPfZo3rCgqBj4fMZw0PLn2PWeQmAO0f7dbvVUS+h3b+zNPjLlrXkvpIcTVcxA=IyTuZWZTOHby0aD4b/i4XwMBF1QYqoMIj/gcnbqsPAY=JoZI2KpzVMKj2IuN6QeTRLd2kFmBgJPBhdnsYDACcHcTuUTntPc5CuC+7cdcG0AyB4vSn/8TFcMtiGGTIGfOD3EQxEBBBKiN4tfjzD5U2NIIfYOqboXWplA5VFH/Sb1I/QXkfp0CZ5pv5ko1stEtdVcBbObG90MUX6IqvrKPmCw= +Verify nested signedXml > True : +sg4j+LFYSzu6ZSzp2Jrh7CxLATJlNH/KTEQlXcfmtM=GBYFP0HPapV9CBUVsWWnokOhEWkJeTIVf8U3hy3DxPNUiqungv6jcfVmYPEazzjkSkxvVEEPZZ8tCr6fiWHl2Mlm/9zMwfFDX3pxsNirtkAMTk73xwajGw6SB+NQiA1NgG21TabU4S6CVoQGdW9zAUSYqQ/K/6b8uu+z26uEad0=gOyUYjJl2u0ljtYCKT6it/xfIC45SQUR6RUTq6ngLk4=saT83xL1EoONw2q22s+t1k6vO29mt/znMYNChyOUhJPsY5VWpwWPBBkYEPCFZGLMK2pz6yyv3b3AbyfueGL+kf43ePkOzCeZlYx87j3bG6nKT1FEsIl89LUdVSv+x76WrZM73tb4ZOeQKbF03WIrwHmVyp0OmPuZyeCpnof7/Sk= diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core80/EncAndDecUtilCUICore.csproj b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core100/EncAndDecUtilCUICore.csproj similarity index 89% rename from root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core80/EncAndDecUtilCUICore.csproj rename to root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core100/EncAndDecUtilCUICore.csproj index 89cb25677..0e14bdc55 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core80/EncAndDecUtilCUICore.csproj +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/core100/EncAndDecUtilCUICore.csproj @@ -3,7 +3,7 @@ Exe $(NoWarn);NU1605 - net8.0 + net10.0 @@ -19,8 +19,6 @@ - - @@ -96,10 +94,10 @@ - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/net48/EncAndDecUtilCUIFx.csproj b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/net48/EncAndDecUtilCUIFx.csproj index e2d87ed09..9ee7fe632 100644 --- a/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/net48/EncAndDecUtilCUIFx.csproj +++ b/root/programs/CS/Frameworks/Tests/EncAndDecUtilCUI/net48/EncAndDecUtilCUIFx.csproj @@ -33,6 +33,9 @@ prompt 4 + + true + ..\..\..\Infrastructure\Build_net48\OpenTouryo.Public.dll diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatch48.txt b/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatch48.txt index a622d97fe..7aedc7544 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatch48.txt +++ b/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatch48.txt @@ -69,7 +69,7 @@ log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.Level log4net: Created Appender [OPERATION2] log4net: Adding appender named [OPERATION2] to logger [OPERATION]. log4net: Hierarchy Threshold [] -[2025/07/01 18:47:05,935],[INFO ],[1],,,,----->>,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatch\bin\Debug\SimpleBatch.exe,-,SelectCount,SQL%individual%static%- +[2025/11/18 15:19:08,286],[INFO ],[1],,,,----->>,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatch\bin\Debug\SimpleBatch.exe,-,SelectCount,SQL%individual%static%- log4net: configuring repository [log4net-default-repository] using stream log4net: loading XML configuration log4net: Configuring Repository [log4net-default-repository] @@ -144,6 +144,6 @@ log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.Level log4net: Created Appender [OPERATION2] log4net: Adding appender named [OPERATION2] to logger [OPERATION]. log4net: Hierarchy Threshold [] -[2025/07/01 18:47:06,130],[INFO ],[1],140,125,[commandText]:SELECT COUNT(*) FROM Shippers [commandParameter]: -[2025/07/01 18:47:06,132],[INFO ],[1],,,,<<-----,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatch\bin\Debug\SimpleBatch.exe,-,SelectCount,SQL%individual%static%-,174,156 +[2025/11/18 15:19:08,522],[INFO ],[1],153,109,[commandText]:SELECT COUNT(*) FROM Shippers [commandParameter]: +[2025/11/18 15:19:08,523],[INFO ],[1],,,,<<-----,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatch\bin\Debug\SimpleBatch.exe,-,SelectCount,SQL%individual%static%-,214,172 3件のデータがあります diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore80.txt b/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore100.txt similarity index 97% rename from root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore80.txt rename to root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore100.txt index afe04a317..6c070d34d 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore80.txt +++ b/root/programs/CS/Frameworks/Tests/TestBatch/ResultSimpleBatchCore100.txt @@ -69,7 +69,7 @@ log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.Level log4net: Created Appender [OPERATION2] log4net: Adding appender named [OPERATION2] to logger [OPERATION]. log4net: Hierarchy Threshold [] -[2025/07/01 18:47:14,197],[INFO ],[1],,,,----->>,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net8.0\SimpleBatchCore.dll,-,SelectCount,SQL%individual%static%- +[2025/11/18 15:19:19,105],[INFO ],[2],,,,----->>,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net10.0\SimpleBatchCore.dll,-,SelectCount,SQL%individual%static%- log4net: configuring repository [log4net-default-repository] using stream log4net: loading XML configuration log4net: Configuring Repository [log4net-default-repository] @@ -144,6 +144,6 @@ log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.Level log4net: Created Appender [OPERATION2] log4net: Adding appender named [OPERATION2] to logger [OPERATION]. log4net: Hierarchy Threshold [] -[2025/07/01 18:47:14,323],[INFO ],[1],74,,[commandText]:SELECT COUNT(*) FROM Shippers [commandParameter]: -[2025/07/01 18:47:14,324],[INFO ],[1],,,,<<-----,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net8.0\SimpleBatchCore.dll,-,SelectCount,SQL%individual%static%-,107, +[2025/11/18 15:19:19,225],[INFO ],[2],67,,[commandText]:SELECT COUNT(*) FROM Shippers [commandParameter]: +[2025/11/18 15:19:19,227],[INFO ],[2],,,,<<-----,C:\OpenTouryo\root\programs\CS\Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net10.0\SimpleBatchCore.dll,-,SelectCount,SQL%individual%static%-,97, 3件のデータがあります diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SimpleBatch.sln b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SimpleBatch.sln index abe718327..016e35d26 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SimpleBatch.sln +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatch/SimpleBatch.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBatch", "SimpleBatch.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.csproj b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.csproj index c5cfe9bef..3107c6493 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.csproj +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 SimpleBatchCore SimpleBatchCore @@ -25,28 +25,27 @@ - - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.sln b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.sln index e935816af..172653244 100644 --- a/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.sln +++ b/root/programs/CS/Frameworks/Tests/TestBatch/SimpleBatchCore/SimpleBatchCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27428.2015 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBatchCore", "SimpleBatchCore.csproj", "{4E1E7400-A012-49E2-8D28-A361F0E1BEE2}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/TestCode/Result48.txt b/root/programs/CS/Frameworks/Tests/TestCode/Result48.txt index 230a23ae9..bd93ca737 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/Result48.txt +++ b/root/programs/CS/Frameworks/Tests/TestCode/Result48.txt @@ -70,11 +70,11 @@ log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.Level log4net: Created Appender [OPERATION2] log4net: Adding appender named [OPERATION2] to logger [OPERATION]. log4net: Hierarchy Threshold [] -[2025/07/01 18:45:53,174],[DEBUG],[1],LogIF.DebugLog("ACCESS"); -[2025/07/01 18:45:53,189],[INFO ],[1],LogIF.InfoLog("ACCESS"); -[2025/07/01 18:45:53,190],[WARN ],[1],LogIF.WarnLog("ACCESS"); -[2025/07/01 18:45:53,190],[ERROR],[1],LogIF.ErrorLog("ACCESS"); -[2025/07/01 18:45:53,190],[FATAL],[1],LogIF.FatalLog("ACCESS"); +[2025/11/18 15:17:57,158],[DEBUG],[1],LogIF.DebugLog("ACCESS"); +[2025/11/18 15:17:57,174],[INFO ],[1],LogIF.InfoLog("ACCESS"); +[2025/11/18 15:17:57,175],[WARN ],[1],LogIF.WarnLog("ACCESS"); +[2025/11/18 15:17:57,175],[ERROR],[1],LogIF.ErrorLog("ACCESS"); +[2025/11/18 15:17:57,175],[FATAL],[1],LogIF.FatalLog("ACCESS"); ---------------------------------------------------------------------------------------------------- GetMessage: ～メッセージID:I0001に対応する記述（正常系）～ GetMessage: ～メッセージID:E0001に対応する記述（異常系）～ diff --git a/root/programs/CS/Frameworks/Tests/TestCode/ResultCore80.txt b/root/programs/CS/Frameworks/Tests/TestCode/ResultCore100.txt similarity index 95% rename from root/programs/CS/Frameworks/Tests/TestCode/ResultCore80.txt rename to root/programs/CS/Frameworks/Tests/TestCode/ResultCore100.txt index 361403735..f223484f4 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/ResultCore80.txt +++ b/root/programs/CS/Frameworks/Tests/TestCode/ResultCore100.txt @@ -1,2323 +1,2323 @@ ----------------------------------------------------------------------------------------------------- -log4net: Configuration update mode [Merge]. -log4net: Retrieving an instance of log4net.Repository.Logger for logger [ACCESS]. -log4net: Setting [ACCESS] additivity to [True]. -log4net: Logger [ACCESS] Level string is [All]. -log4net: Logger [ACCESS] level set to [name="ALL",value=-2147483648]. -log4net: Loading Appender [ACCESS2] type: [log4net.Appender.ConsoleAppender] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] -log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] -log4net: Setting Property [LevelMin] to Level value [DEBUG] -log4net: Setting Property [LevelMax] to Level value [FATAL] -log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] -log4net: Created Appender [ACCESS2] -log4net: Adding appender named [ACCESS2] to logger [ACCESS]. -log4net: Retrieving an instance of log4net.Repository.Logger for logger [SQLTRACE]. -log4net: Setting [SQLTRACE] additivity to [True]. -log4net: Logger [SQLTRACE] Level string is [All]. -log4net: Logger [SQLTRACE] level set to [name="ALL",value=-2147483648]. -log4net: Loading Appender [SQLTRACE2] type: [log4net.Appender.ConsoleAppender] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] -log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] -log4net: Setting Property [LevelMin] to Level value [DEBUG] -log4net: Setting Property [LevelMax] to Level value [FATAL] -log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] -log4net: Created Appender [SQLTRACE2] -log4net: Adding appender named [SQLTRACE2] to logger [SQLTRACE]. -log4net: Retrieving an instance of log4net.Repository.Logger for logger [OPERATION]. -log4net: Setting [OPERATION] additivity to [True]. -log4net: Logger [OPERATION] Level string is [All]. -log4net: Logger [OPERATION] level set to [name="ALL",value=-2147483648]. -log4net: Loading Appender [OPERATION2] type: [log4net.Appender.ConsoleAppender] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] -log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] -log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] -log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] -log4net: Setting Property [LevelMin] to Level value [DEBUG] -log4net: Setting Property [LevelMax] to Level value [FATAL] -log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] -log4net: Created Appender [OPERATION2] -log4net: Adding appender named [OPERATION2] to logger [OPERATION]. -log4net: Hierarchy Threshold [] -[2025/07/01 18:45:57,746],[DEBUG],[1],LogIF.DebugLog("ACCESS"); -[2025/07/01 18:45:57,785],[INFO ],[1],LogIF.InfoLog("ACCESS"); -[2025/07/01 18:45:57,786],[WARN ],[1],LogIF.WarnLog("ACCESS"); -[2025/07/01 18:45:57,786],[ERROR],[1],LogIF.ErrorLog("ACCESS"); -[2025/07/01 18:45:57,787],[FATAL],[1],LogIF.FatalLog("ACCESS"); ----------------------------------------------------------------------------------------------------- -GetMessage: ～メッセージID:I0001に対応する記述（正常系）～ -GetMessage: ～メッセージID:E0001に対応する記述（異常系）～ --------------------------------------------------- -GetSharedProperty: てすと１ -GetSharedProperty: てすと３ ----------------------------------------------------------------------------------------------------- -StringChecker.IsNumbers - あああ: False -StringChecker.IsNumbers - １１１: True -StringChecker.IsNumbers_Hankaku - あああ: False -StringChecker.IsNumbers_Hankaku - 111111: True -StringChecker.IsNumbers_Zenkaku - あああ: False -StringChecker.IsNumbers_Zenkaku - １１１: True ----------------------------------------------------------------------------------------------------- -StringChecker.IsAlphabet - あああ: False -StringChecker.IsAlphabet - ａａａ: True -StringChecker.IsAlphabet_Hankaku - あああ: False -StringChecker.IsAlphabet_Hankaku - aaaaaa: True -StringChecker.IsAlphabet_Zenkaku - あああ: False -StringChecker.IsAlphabet_Zenkaku - ａａａ: True ----------------------------------------------------------------------------------------------------- -StringChecker.IsHiragana - ａａａ: False -StringChecker.IsHiragana - あああ: True ----------------------------------------------------------------------------------------------------- -StringChecker.IsKatakana - あああ: False -StringChecker.IsKatakana - アアア: True -StringChecker.IsKatakana_Zenkaku - あああ: False -StringChecker.IsKatakana_Zenkaku - アアア: True -StringChecker.IsKatakana_Zenkaku - アアア: False -StringChecker.IsKatakana_Zenkaku - ｱｱｱｱｱｱ: True ----------------------------------------------------------------------------------------------------- -StringChecker.IsKanji - あああ: False -StringChecker.IsKanji - 亜亜亜: True ----------------------------------------------------------------------------------------------------- -StringChecker.IsShift_Jis - 鱓鱓鱓: False -StringChecker.IsShift_Jis - 亜亜亜: True -StringChecker.IsShift_Jis_Zenkaku - aaaaaa: False -StringChecker.IsShift_Jis_Zenkaku - 亜亜亜: True -StringChecker.IsShift_Jis_Hankaku - ａａａ: False -StringChecker.IsShift_Jis_Hankaku - aaaaaa: True ----------------------------------------------------------------------------------------------------- -TestFormatChecker.IsJpZipCode -JpZipCode_Hyphen -000-0000: True -aaa-aaaa: False -0000-00000: False -0000-0000: False -000-00000: False -00-000: False -00-0000: False -000-000: False -JpZipKuCode1_Hyphen -000-00: True -aaa-aa: False -0000-000: False -0000-00: False -000-000: False -00-0: False -00-00: False -000-0: False -JpZipKuCode2_Hyphen -000: True -aaa: False -0000: False -00: False -JpZipCode_NoHyphen -0000000: True -aaaaaaa: False -00000000: False -000000: False -JpZipKuCode1_NoHyphen -00000: True -aaaaa: False -000000: False -0000: False -JpZipKuCode2_NoHyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode_Hyphen -JpZipCode_Hyphen -000-0000: True -aaa-aaaa: False -0000-00000: False -0000-0000: False -000-00000: False -00-000: False -00-0000: False -000-000: False -JpZipKuCode1_Hyphen -000-00: True -aaa-aa: False -0000-000: False -0000-00: False -000-000: False -00-0: False -00-00: False -000-0: False -JpZipKuCode2_Hyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode_NoHyphen -JpZipCode_NoHyphen -0000000: True -aaaaaaa: False -00000000: False -000000: False -JpZipKuCode1_NoHyphen -00000: True -aaaaa: False -000000: False -0000: False -JpZipKuCode2_NoHyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode7 -JpZipCode_Hyphen -000-0000: True -aaa-aaaa: False -0000-00000: False -0000-0000: False -000-00000: False -00-000: False -00-0000: False -000-000: False -JpZipCode_NoHyphen -0000000: True -aaaaaaa: False -00000000: False -000000: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode7_Hyphen -JpZipCode_Hyphen -000-0000: True -aaa-aaaa: False -0000-00000: False -0000-0000: False -000-00000: False -00-000: False -00-0000: False -000-000: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode7_NoHyphen -JpZipCode_NoHyphen -0000000: True -aaaaaaa: False -00000000: False -000000: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode5 -JpZipKuCode1_Hyphen -000-00: True -aaa-aa: False -0000-000: False -0000-00: False -000-000: False -00-0: False -00-00: False -000-0: False -JpZipKuCode2_Hyphen -000: True -aaa: False -0000: False -00: False -JpZipKuCode1_NoHyphen -00000: True -aaaaa: False -000000: False -0000: False -JpZipKuCode2_NoHyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode5_Hyphen -JpZipKuCode1_Hyphen -000-00: True -aaa-aa: False -0000-000: False -0000-00: False -000-000: False -00-0: False -00-00: False -000-0: False -JpZipKuCode2_Hyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpZipCode5_NoHyphen -JpZipKuCode1_NoHyphen -00000: True -aaaaa: False -000000: False -0000: False -JpZipKuCode2_NoHyphen -000: True -aaa: False -0000: False -00: False --------------------------------------------------- -TestFormatChecker.IsJpTelephoneNumber -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: True -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: True -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: True -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: True -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: True -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: True -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: True -020-999-9999: True -020-9999-999: False -060-9999-9999: True -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: True -060-999-9999: True -060-9999-999: False -070-9999-9999: True -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: True -070-999-9999: True -070-9999-999: False -080-9999-9999: True -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: True -080-999-9999: True -080-9999-999: False -090-9999-9999: True -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: True -090-999-9999: True -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: True -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: True -06099999999: True -07099999999: True -08099999999: True -09099999999: True -01099999999: False -03099999999: False -04099999999: False -05099999999: True -JpIpPhoneNumber_Hyphen -050-9999-9999: True -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: True -050-999-9999: True -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: True -030-9999-9999: False -040-9999-9999: False -060-9999-9999: True -070-9999-9999: True -080-9999-9999: True -090-9999-9999: True -JpIpPhoneNumber_NoHyphen -05099999999: True -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: True -01099999999: False -02099999999: True -03099999999: False -04099999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True --------------------------------------------------- -TestFormatChecker.IsJpTelephoneNumber_Hyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: True -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: True -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: True -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: True -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: True -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: True -020-999-9999: True -020-9999-999: False -060-9999-9999: True -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: True -060-999-9999: True -060-9999-999: False -070-9999-9999: True -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: True -070-999-9999: True -070-9999-999: False -080-9999-9999: True -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: True -080-999-9999: True -080-9999-999: False -090-9999-9999: True -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: True -090-999-9999: True -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: True -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: True -050-999-9999: True -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: True -030-9999-9999: False -040-9999-9999: False -060-9999-9999: True -070-9999-9999: True -080-9999-9999: True -090-9999-9999: True -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpTelephoneNumber_NoHyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: True -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: True -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: True -06099999999: True -07099999999: True -08099999999: True -09099999999: True -01099999999: False -03099999999: False -04099999999: False -05099999999: True -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: True -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: True -01099999999: False -02099999999: True -03099999999: False -04099999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True --------------------------------------------------- -TestFormatChecker.IsJpFixedLinePhoneNumber -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: True -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: True -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: True -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: True -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: True -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: True -020-999-9999: True -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: True -060-999-9999: True -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: True -070-999-9999: True -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: True -080-999-9999: True -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: True -090-999-9999: True -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: True -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: True -050-999-9999: True -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: True -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpFixedLinePhoneNumber_Hyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: True -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: True -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: True -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: True -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: True -020-999-9999: True -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: True -060-999-9999: True -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: True -070-999-9999: True -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: True -080-999-9999: True -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: True -090-999-9999: True -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: True -050-999-9999: True -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpFixedLinePhoneNumber_NoHyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: True -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: True -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: True -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpCellularPhoneNumber -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: True -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: True -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: True -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: True -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: True -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: True -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: True -030-9999-9999: False -040-9999-9999: False -060-9999-9999: True -070-9999-9999: True -080-9999-9999: True -090-9999-9999: True -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: True -03099999999: False -04099999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True --------------------------------------------------- -TestFormatChecker.IsJpCellularPhoneNumber_Hyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: True -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: True -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: True -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: True -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: True -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: True -030-9999-9999: False -040-9999-9999: False -060-9999-9999: True -070-9999-9999: True -080-9999-9999: True -090-9999-9999: True -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpCellularPhoneNumber_NoHyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: True -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: True -03099999999: False -04099999999: False -06099999999: True -07099999999: True -08099999999: True -09099999999: True --------------------------------------------------- -TestFormatChecker.IsJpIpPhoneNumber -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: True -JpIpPhoneNumber_Hyphen -050-9999-9999: True -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: True -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpIpPhoneNumber_Hyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: False -JpIpPhoneNumber_Hyphen -050-9999-9999: True -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: False -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False --------------------------------------------------- -TestFormatChecker.IsJpIpPhoneNumber_NoHyphen -JpFixedLinePhoneNumber_Hyphen -09999-9-9999: False -99999-9-9999: False -0aaaa-a-aaaa: False -099999-9-9999: False -09999-99-9999: False -09999-9-99999: False -0999--999: False -0999-9-9999: False -09999--9999: False -09999-9-999: False -0999-99-9999: False -9999-99-9999: False -0aaa-aa-aaaa: False -09999-999-99999: False -09999-99-9999: False -0999-999-9999: False -0999-99-99999: False -099-9-999: False -099-99-9999: False -0999-9-9999: False -0999-99-999: False -099-999-9999: False -999-999-9999: False -0aa-aaa-aaaa: False -0999-9999-99999: False -0999-999-9999: False -099-9999-9999: False -099-999-99999: False -09-99-999: False -09-999-9999: False -099-99-9999: False -099-999-999: False -09-9999-9999: False -99-9999-9999: False -0a-aaaa-aaaa: False -099-99999-99999: False -099-9999-9999: False -09-99999-9999: False -09-9999-99999: False -0-999-999: False -0-9999-9999: False -09-999-9999: False -09-9999-999: False -JpFixedLinePhoneNumber_NoHyphen -0999999999: False -9999999999: False -0aaaaaaaaa: False -09999999999: False -099999999: False -JpCellularPhoneNumber_Hyphen -020-9999-9999: False -929-9999-9999: False -020-aaaa-aaaa: False -0209-99999-99999: False -0209-9999-9999: False -020-99999-9999: False -020-9999-99999: False -02-999-999: False -02-9999-9999: False -020-999-9999: False -020-9999-999: False -060-9999-9999: False -969-9999-9999: False -060-aaaa-aaaa: False -0609-99999-99999: False -0609-9999-9999: False -060-99999-9999: False -060-9999-99999: False -06-999-999: False -06-9999-9999: False -060-999-9999: False -060-9999-999: False -070-9999-9999: False -979-9999-9999: False -070-aaaa-aaaa: False -0709-99999-99999: False -0709-9999-9999: False -070-99999-9999: False -070-9999-99999: False -07-999-999: False -07-9999-9999: False -070-999-9999: False -070-9999-999: False -080-9999-9999: False -989-9999-9999: False -080-aaaa-aaaa: False -0809-99999-99999: False -0809-9999-9999: False -080-99999-9999: False -080-9999-99999: False -08-999-999: False -08-9999-9999: False -080-999-9999: False -080-9999-999: False -090-9999-9999: False -999-9999-9999: False -090-aaaa-aaaa: False -0909-99999-99999: False -0909-9999-9999: False -090-99999-9999: False -090-9999-99999: False -09-999-999: False -09-9999-9999: False -090-999-9999: False -090-9999-999: False -JpCellularPhoneNumber_NoHyphen -02099999999: False -92999999999: False -020aaaaaaaa: False -020999999999: False -0209999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False -01099999999: False -03099999999: False -04099999999: False -05099999999: True -JpIpPhoneNumber_Hyphen -050-9999-9999: False -959-9999-9999: False -050-aaaa-aaaa: False -0509-99999-99999: False -0509-9999-9999: False -050-99999-9999: False -050-9999-99999: False -05-999-999: False -05-9999-9999: False -050-999-9999: False -050-9999-999: False -9999999999999: False -010-9999-9999: False -020-9999-9999: False -030-9999-9999: False -040-9999-9999: False -060-9999-9999: False -070-9999-9999: False -080-9999-9999: False -090-9999-9999: False -JpIpPhoneNumber_NoHyphen -05099999999: True -95999999999: False -050aaaaaaaa: False -050999999999: False -0509999999: False -01099999999: False -02099999999: False -03099999999: False -04099999999: False -06099999999: False -07099999999: False -08099999999: False -09099999999: False ----------------------------------------------------------------------------------------------------- -StringConverter.ToHankaku - アアア: アアア -StringConverter.ToZenkaku - アアア: アアア -StringConverter.ToHiragana - アアア: あああ -StringConverter.ToKatakana - あああ: アアア ----------------------------------------------------------------------------------------------------- -FormatConverter.SeirekiToWareki -1977/4/24, ggy年M月d日（ddd）: 昭和52年4月24日（日） -1977/4/24, ggy年M月d日（ddd）H:m:s: 昭和52年4月24日（日）0:0:0 -1977/4/24 19:15:12, ggy年M月d日（ddd）: 昭和52年4月24日（日） -1977/4/24 19:15:12, ggy年M月d日（ddd）H:m:s: 昭和52年4月24日（日）19:15:12 -1977/4/24 19:15:12, ggy年M月d日（ddd）tt h:m:s: 昭和52年4月24日（日）午後 7:15:12 -1992/2/6 1:1:1, ggyy年MM月dd日 dddd HH:mm:ss: 平成04年02月06日 木曜日 01:01:01 -1992/2/6 13:1:1, ggyy年MM月dd日 dddd tt hh:mm:ss: 平成04年02月06日 木曜日 午後 01:01:01 --------------------------------------------------- -FormatConverter.WarekiToSeireki -昭和52年4月24日（日）, ggy年M月d日（ddd）: 1977/04/24 0:00:00 -昭和52年4月24日（日）19:15:12, ggy年M月d日（ddd）H:m:s: 1977/04/24 19:15:12 -昭和52年4月24日（日）午後 7:15:12, ggy年M月d日（ddd）tt h:m:s: 1977/04/24 19:15:12 -平成04年02月06日 木曜日 01:01:01, ggyy年MM月dd日 dddd HH:mm:ss: 1992/02/06 1:01:01 -平成04年02月06日 木曜日 午後 01:01:01, ggyy年MM月dd日 dddd tt hh:mm:ss: 1992/02/06 13:01:01 --------------------------------------------------- -FormatConverter.AddFigure3 -12,345 -123,456,789 -123.45 -12,345.6789 --12,345 --123,456,789 --123.45 --12,345.6789 -12,345 -123,456,789 -123.45 -12,345.6789 --12,345 --123,456,789 --123.45 --12,345.6789 ----------------------------------------------------------------------------------------------------- -FormatConverter.AddFigure4 -1,2345 -1,2345,6789 -123.45 -1,2345.6789 --1,2345 --1,2345,6789 --123.45 --1,2345.6789 -1,2345 -1,2345,6789 -123.45 -1,2345.6789 --1,2345 --1,2345,6789 --123.45 --1,2345.6789 ----------------------------------------------------------------------------------------------------- -FormatConverter.Suppress -"", 10, '＠': ＠＠＠＠＠＠＠＠＠＠ -"123456789", 0, '＠': 123456789 -"123456789", 1, '＠': 123456789 -"123456789", 5, '＠': 123456789 -"123456789", 9, '＠': 123456789 -"123456789", 10, '＠': ＠123456789 -"123456789", 11, '＠': ＠＠123456789 -"123456789", 20, '＠': ＠＠＠＠＠＠＠＠＠＠＠123456789 -"", 10, '＠': ＠＠＠＠＠＠＠＠＠＠ -"123456789", 0, '＠': abcdefg -"123456789", 1, '＠': abcdefg -"123456789", 5, '＠': abcdefg -"123456789", 9, '＠': ＠＠abcdefg -"123456789", 10, '＠': ＠＠＠abcdefg -"123456789", 11, '＠': ＠＠＠＠abcdefg -"123456789", 20, '＠': ＠＠＠＠＠＠＠＠＠＠＠＠＠abcdefg ----------------------------------------------------------------------------------------------------- -CustomEncode.HtmlEncode: " id="txtXXXXX" /><script type="text/javascript">alert("XSS!!!")</script><input name="txtXXXXX" type="text" value=" ----------------------------------------------------------------------------------------------------- -CustomEncode.UrlEncode: http://www.google.co.jp/search?hl=ja&q=%26 -CustomEncode.UrlEncode2: http%3A%2F%2Fwww.google.co.jp%2Fsearch%3Fhl%3Dja%26q%3D%26 -CustomEncode.UrlEncode2: http%3A%2F%2Fwww.google.co.jp%2Fsearch%3Fhl%3Dja%26q%3D%3C%3E ----------------------------------------------------------------------------------------------------- +---------------------------------------------------------------------------------------------------- +log4net: Configuration update mode [Merge]. +log4net: Retrieving an instance of log4net.Repository.Logger for logger [ACCESS]. +log4net: Setting [ACCESS] additivity to [True]. +log4net: Logger [ACCESS] Level string is [All]. +log4net: Logger [ACCESS] level set to [name="ALL",value=-2147483648]. +log4net: Loading Appender [ACCESS2] type: [log4net.Appender.ConsoleAppender] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] +log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] +log4net: Setting Property [LevelMin] to Level value [DEBUG] +log4net: Setting Property [LevelMax] to Level value [FATAL] +log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] +log4net: Created Appender [ACCESS2] +log4net: Adding appender named [ACCESS2] to logger [ACCESS]. +log4net: Retrieving an instance of log4net.Repository.Logger for logger [SQLTRACE]. +log4net: Setting [SQLTRACE] additivity to [True]. +log4net: Logger [SQLTRACE] Level string is [All]. +log4net: Logger [SQLTRACE] level set to [name="ALL",value=-2147483648]. +log4net: Loading Appender [SQLTRACE2] type: [log4net.Appender.ConsoleAppender] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] +log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] +log4net: Setting Property [LevelMin] to Level value [DEBUG] +log4net: Setting Property [LevelMax] to Level value [FATAL] +log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] +log4net: Created Appender [SQLTRACE2] +log4net: Adding appender named [SQLTRACE2] to logger [SQLTRACE]. +log4net: Retrieving an instance of log4net.Repository.Logger for logger [OPERATION]. +log4net: Setting [OPERATION] additivity to [True]. +log4net: Logger [OPERATION] Level string is [All]. +log4net: Logger [OPERATION] level set to [name="ALL",value=-2147483648]. +log4net: Loading Appender [OPERATION2] type: [log4net.Appender.ConsoleAppender] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [ConversionPattern] to String value [[%date{yyyy/MM/dd HH:mm:ss,fff}],[%-5level],[%thread],%message%newline] +log4net: Converter [literal] Option [[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [date] Option [yyyy/MM/dd HH:mm:ss,fff] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [level] Option [] Format [min=5,max=2147483647,leftAlign=True] +log4net: Converter [literal] Option [],[] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [thread] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [literal] Option [],] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [message] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Converter [newline] Option [] Format [min=-1,max=2147483647,leftAlign=False] +log4net: Setting Property [Layout] to object [log4net.Layout.PatternLayout] +log4net: Setting Property [LevelMin] to Level value [DEBUG] +log4net: Setting Property [LevelMax] to Level value [FATAL] +log4net: Setting Collection Property [AddFilter] to object [log4net.Filter.LevelRangeFilter] +log4net: Created Appender [OPERATION2] +log4net: Adding appender named [OPERATION2] to logger [OPERATION]. +log4net: Hierarchy Threshold [] +[2025/11/18 04:03:14,431],[DEBUG],[2],LogIF.DebugLog("ACCESS"); +[2025/11/18 04:03:14,445],[INFO ],[2],LogIF.InfoLog("ACCESS"); +[2025/11/18 04:03:14,445],[WARN ],[2],LogIF.WarnLog("ACCESS"); +[2025/11/18 04:03:14,446],[ERROR],[2],LogIF.ErrorLog("ACCESS"); +[2025/11/18 04:03:14,446],[FATAL],[2],LogIF.FatalLog("ACCESS"); +---------------------------------------------------------------------------------------------------- +GetMessage: ～メッセージID:I0001に対応する記述（正常系）～ +GetMessage: ～メッセージID:E0001に対応する記述（異常系）～ +-------------------------------------------------- +GetSharedProperty: てすと１ +GetSharedProperty: てすと３ +---------------------------------------------------------------------------------------------------- +StringChecker.IsNumbers - あああ: False +StringChecker.IsNumbers - １１１: True +StringChecker.IsNumbers_Hankaku - あああ: False +StringChecker.IsNumbers_Hankaku - 111111: True +StringChecker.IsNumbers_Zenkaku - あああ: False +StringChecker.IsNumbers_Zenkaku - １１１: True +---------------------------------------------------------------------------------------------------- +StringChecker.IsAlphabet - あああ: False +StringChecker.IsAlphabet - ａａａ: True +StringChecker.IsAlphabet_Hankaku - あああ: False +StringChecker.IsAlphabet_Hankaku - aaaaaa: True +StringChecker.IsAlphabet_Zenkaku - あああ: False +StringChecker.IsAlphabet_Zenkaku - ａａａ: True +---------------------------------------------------------------------------------------------------- +StringChecker.IsHiragana - ａａａ: False +StringChecker.IsHiragana - あああ: True +---------------------------------------------------------------------------------------------------- +StringChecker.IsKatakana - あああ: False +StringChecker.IsKatakana - アアア: True +StringChecker.IsKatakana_Zenkaku - あああ: False +StringChecker.IsKatakana_Zenkaku - アアア: True +StringChecker.IsKatakana_Zenkaku - アアア: False +StringChecker.IsKatakana_Zenkaku - ｱｱｱｱｱｱ: True +---------------------------------------------------------------------------------------------------- +StringChecker.IsKanji - あああ: False +StringChecker.IsKanji - 亜亜亜: True +---------------------------------------------------------------------------------------------------- +StringChecker.IsShift_Jis - 鱓鱓鱓: False +StringChecker.IsShift_Jis - 亜亜亜: True +StringChecker.IsShift_Jis_Zenkaku - aaaaaa: False +StringChecker.IsShift_Jis_Zenkaku - 亜亜亜: True +StringChecker.IsShift_Jis_Hankaku - ａａａ: False +StringChecker.IsShift_Jis_Hankaku - aaaaaa: True +---------------------------------------------------------------------------------------------------- +TestFormatChecker.IsJpZipCode +JpZipCode_Hyphen +000-0000: True +aaa-aaaa: False +0000-00000: False +0000-0000: False +000-00000: False +00-000: False +00-0000: False +000-000: False +JpZipKuCode1_Hyphen +000-00: True +aaa-aa: False +0000-000: False +0000-00: False +000-000: False +00-0: False +00-00: False +000-0: False +JpZipKuCode2_Hyphen +000: True +aaa: False +0000: False +00: False +JpZipCode_NoHyphen +0000000: True +aaaaaaa: False +00000000: False +000000: False +JpZipKuCode1_NoHyphen +00000: True +aaaaa: False +000000: False +0000: False +JpZipKuCode2_NoHyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode_Hyphen +JpZipCode_Hyphen +000-0000: True +aaa-aaaa: False +0000-00000: False +0000-0000: False +000-00000: False +00-000: False +00-0000: False +000-000: False +JpZipKuCode1_Hyphen +000-00: True +aaa-aa: False +0000-000: False +0000-00: False +000-000: False +00-0: False +00-00: False +000-0: False +JpZipKuCode2_Hyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode_NoHyphen +JpZipCode_NoHyphen +0000000: True +aaaaaaa: False +00000000: False +000000: False +JpZipKuCode1_NoHyphen +00000: True +aaaaa: False +000000: False +0000: False +JpZipKuCode2_NoHyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode7 +JpZipCode_Hyphen +000-0000: True +aaa-aaaa: False +0000-00000: False +0000-0000: False +000-00000: False +00-000: False +00-0000: False +000-000: False +JpZipCode_NoHyphen +0000000: True +aaaaaaa: False +00000000: False +000000: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode7_Hyphen +JpZipCode_Hyphen +000-0000: True +aaa-aaaa: False +0000-00000: False +0000-0000: False +000-00000: False +00-000: False +00-0000: False +000-000: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode7_NoHyphen +JpZipCode_NoHyphen +0000000: True +aaaaaaa: False +00000000: False +000000: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode5 +JpZipKuCode1_Hyphen +000-00: True +aaa-aa: False +0000-000: False +0000-00: False +000-000: False +00-0: False +00-00: False +000-0: False +JpZipKuCode2_Hyphen +000: True +aaa: False +0000: False +00: False +JpZipKuCode1_NoHyphen +00000: True +aaaaa: False +000000: False +0000: False +JpZipKuCode2_NoHyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode5_Hyphen +JpZipKuCode1_Hyphen +000-00: True +aaa-aa: False +0000-000: False +0000-00: False +000-000: False +00-0: False +00-00: False +000-0: False +JpZipKuCode2_Hyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpZipCode5_NoHyphen +JpZipKuCode1_NoHyphen +00000: True +aaaaa: False +000000: False +0000: False +JpZipKuCode2_NoHyphen +000: True +aaa: False +0000: False +00: False +-------------------------------------------------- +TestFormatChecker.IsJpTelephoneNumber +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: True +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: True +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: True +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: True +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: True +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: True +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: True +020-999-9999: True +020-9999-999: False +060-9999-9999: True +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: True +060-999-9999: True +060-9999-999: False +070-9999-9999: True +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: True +070-999-9999: True +070-9999-999: False +080-9999-9999: True +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: True +080-999-9999: True +080-9999-999: False +090-9999-9999: True +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: True +090-999-9999: True +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: True +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: True +06099999999: True +07099999999: True +08099999999: True +09099999999: True +01099999999: False +03099999999: False +04099999999: False +05099999999: True +JpIpPhoneNumber_Hyphen +050-9999-9999: True +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: True +050-999-9999: True +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: True +030-9999-9999: False +040-9999-9999: False +060-9999-9999: True +070-9999-9999: True +080-9999-9999: True +090-9999-9999: True +JpIpPhoneNumber_NoHyphen +05099999999: True +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: True +01099999999: False +02099999999: True +03099999999: False +04099999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +-------------------------------------------------- +TestFormatChecker.IsJpTelephoneNumber_Hyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: True +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: True +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: True +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: True +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: True +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: True +020-999-9999: True +020-9999-999: False +060-9999-9999: True +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: True +060-999-9999: True +060-9999-999: False +070-9999-9999: True +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: True +070-999-9999: True +070-9999-999: False +080-9999-9999: True +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: True +080-999-9999: True +080-9999-999: False +090-9999-9999: True +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: True +090-999-9999: True +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: True +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: True +050-999-9999: True +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: True +030-9999-9999: False +040-9999-9999: False +060-9999-9999: True +070-9999-9999: True +080-9999-9999: True +090-9999-9999: True +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpTelephoneNumber_NoHyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: True +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: True +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: True +06099999999: True +07099999999: True +08099999999: True +09099999999: True +01099999999: False +03099999999: False +04099999999: False +05099999999: True +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: True +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: True +01099999999: False +02099999999: True +03099999999: False +04099999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +-------------------------------------------------- +TestFormatChecker.IsJpFixedLinePhoneNumber +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: True +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: True +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: True +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: True +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: True +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: True +020-999-9999: True +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: True +060-999-9999: True +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: True +070-999-9999: True +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: True +080-999-9999: True +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: True +090-999-9999: True +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: True +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: True +050-999-9999: True +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: True +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpFixedLinePhoneNumber_Hyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: True +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: True +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: True +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: True +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: True +020-999-9999: True +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: True +060-999-9999: True +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: True +070-999-9999: True +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: True +080-999-9999: True +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: True +090-999-9999: True +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: True +050-999-9999: True +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpFixedLinePhoneNumber_NoHyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: True +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: True +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: True +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpCellularPhoneNumber +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: True +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: True +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: True +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: True +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: True +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: True +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: True +030-9999-9999: False +040-9999-9999: False +060-9999-9999: True +070-9999-9999: True +080-9999-9999: True +090-9999-9999: True +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: True +03099999999: False +04099999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +-------------------------------------------------- +TestFormatChecker.IsJpCellularPhoneNumber_Hyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: True +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: True +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: True +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: True +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: True +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: True +030-9999-9999: False +040-9999-9999: False +060-9999-9999: True +070-9999-9999: True +080-9999-9999: True +090-9999-9999: True +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpCellularPhoneNumber_NoHyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: True +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: True +03099999999: False +04099999999: False +06099999999: True +07099999999: True +08099999999: True +09099999999: True +-------------------------------------------------- +TestFormatChecker.IsJpIpPhoneNumber +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: True +JpIpPhoneNumber_Hyphen +050-9999-9999: True +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: True +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpIpPhoneNumber_Hyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: False +JpIpPhoneNumber_Hyphen +050-9999-9999: True +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: False +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +-------------------------------------------------- +TestFormatChecker.IsJpIpPhoneNumber_NoHyphen +JpFixedLinePhoneNumber_Hyphen +09999-9-9999: False +99999-9-9999: False +0aaaa-a-aaaa: False +099999-9-9999: False +09999-99-9999: False +09999-9-99999: False +0999--999: False +0999-9-9999: False +09999--9999: False +09999-9-999: False +0999-99-9999: False +9999-99-9999: False +0aaa-aa-aaaa: False +09999-999-99999: False +09999-99-9999: False +0999-999-9999: False +0999-99-99999: False +099-9-999: False +099-99-9999: False +0999-9-9999: False +0999-99-999: False +099-999-9999: False +999-999-9999: False +0aa-aaa-aaaa: False +0999-9999-99999: False +0999-999-9999: False +099-9999-9999: False +099-999-99999: False +09-99-999: False +09-999-9999: False +099-99-9999: False +099-999-999: False +09-9999-9999: False +99-9999-9999: False +0a-aaaa-aaaa: False +099-99999-99999: False +099-9999-9999: False +09-99999-9999: False +09-9999-99999: False +0-999-999: False +0-9999-9999: False +09-999-9999: False +09-9999-999: False +JpFixedLinePhoneNumber_NoHyphen +0999999999: False +9999999999: False +0aaaaaaaaa: False +09999999999: False +099999999: False +JpCellularPhoneNumber_Hyphen +020-9999-9999: False +929-9999-9999: False +020-aaaa-aaaa: False +0209-99999-99999: False +0209-9999-9999: False +020-99999-9999: False +020-9999-99999: False +02-999-999: False +02-9999-9999: False +020-999-9999: False +020-9999-999: False +060-9999-9999: False +969-9999-9999: False +060-aaaa-aaaa: False +0609-99999-99999: False +0609-9999-9999: False +060-99999-9999: False +060-9999-99999: False +06-999-999: False +06-9999-9999: False +060-999-9999: False +060-9999-999: False +070-9999-9999: False +979-9999-9999: False +070-aaaa-aaaa: False +0709-99999-99999: False +0709-9999-9999: False +070-99999-9999: False +070-9999-99999: False +07-999-999: False +07-9999-9999: False +070-999-9999: False +070-9999-999: False +080-9999-9999: False +989-9999-9999: False +080-aaaa-aaaa: False +0809-99999-99999: False +0809-9999-9999: False +080-99999-9999: False +080-9999-99999: False +08-999-999: False +08-9999-9999: False +080-999-9999: False +080-9999-999: False +090-9999-9999: False +999-9999-9999: False +090-aaaa-aaaa: False +0909-99999-99999: False +0909-9999-9999: False +090-99999-9999: False +090-9999-99999: False +09-999-999: False +09-9999-9999: False +090-999-9999: False +090-9999-999: False +JpCellularPhoneNumber_NoHyphen +02099999999: False +92999999999: False +020aaaaaaaa: False +020999999999: False +0209999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +01099999999: False +03099999999: False +04099999999: False +05099999999: True +JpIpPhoneNumber_Hyphen +050-9999-9999: False +959-9999-9999: False +050-aaaa-aaaa: False +0509-99999-99999: False +0509-9999-9999: False +050-99999-9999: False +050-9999-99999: False +05-999-999: False +05-9999-9999: False +050-999-9999: False +050-9999-999: False +9999999999999: False +010-9999-9999: False +020-9999-9999: False +030-9999-9999: False +040-9999-9999: False +060-9999-9999: False +070-9999-9999: False +080-9999-9999: False +090-9999-9999: False +JpIpPhoneNumber_NoHyphen +05099999999: True +95999999999: False +050aaaaaaaa: False +050999999999: False +0509999999: False +01099999999: False +02099999999: False +03099999999: False +04099999999: False +06099999999: False +07099999999: False +08099999999: False +09099999999: False +---------------------------------------------------------------------------------------------------- +StringConverter.ToHankaku - アアア: アアア +StringConverter.ToZenkaku - アアア: アアア +StringConverter.ToHiragana - アアア: あああ +StringConverter.ToKatakana - あああ: アアア +---------------------------------------------------------------------------------------------------- +FormatConverter.SeirekiToWareki +1977/4/24, ggy年M月d日（ddd）: 昭和52年4月24日（日） +1977/4/24, ggy年M月d日（ddd）H:m:s: 昭和52年4月24日（日）0:0:0 +1977/4/24 19:15:12, ggy年M月d日（ddd）: 昭和52年4月24日（日） +1977/4/24 19:15:12, ggy年M月d日（ddd）H:m:s: 昭和52年4月24日（日）19:15:12 +1977/4/24 19:15:12, ggy年M月d日（ddd）tt h:m:s: 昭和52年4月24日（日）午後 7:15:12 +1992/2/6 1:1:1, ggyy年MM月dd日 dddd HH:mm:ss: 平成04年02月06日 木曜日 01:01:01 +1992/2/6 13:1:1, ggyy年MM月dd日 dddd tt hh:mm:ss: 平成04年02月06日 木曜日 午後 01:01:01 +-------------------------------------------------- +FormatConverter.WarekiToSeireki +昭和52年4月24日（日）, ggy年M月d日（ddd）: 1977/04/24 0:00:00 +昭和52年4月24日（日）19:15:12, ggy年M月d日（ddd）H:m:s: 1977/04/24 19:15:12 +昭和52年4月24日（日）午後 7:15:12, ggy年M月d日（ddd）tt h:m:s: 1977/04/24 19:15:12 +平成04年02月06日 木曜日 01:01:01, ggyy年MM月dd日 dddd HH:mm:ss: 1992/02/06 1:01:01 +平成04年02月06日 木曜日 午後 01:01:01, ggyy年MM月dd日 dddd tt hh:mm:ss: 1992/02/06 13:01:01 +-------------------------------------------------- +FormatConverter.AddFigure3 +12,345 +123,456,789 +123.45 +12,345.6789 +-12,345 +-123,456,789 +-123.45 +-12,345.6789 +12,345 +123,456,789 +123.45 +12,345.6789 +-12,345 +-123,456,789 +-123.45 +-12,345.6789 +---------------------------------------------------------------------------------------------------- +FormatConverter.AddFigure4 +1,2345 +1,2345,6789 +123.45 +1,2345.6789 +-1,2345 +-1,2345,6789 +-123.45 +-1,2345.6789 +1,2345 +1,2345,6789 +123.45 +1,2345.6789 +-1,2345 +-1,2345,6789 +-123.45 +-1,2345.6789 +---------------------------------------------------------------------------------------------------- +FormatConverter.Suppress +"", 10, '＠': ＠＠＠＠＠＠＠＠＠＠ +"123456789", 0, '＠': 123456789 +"123456789", 1, '＠': 123456789 +"123456789", 5, '＠': 123456789 +"123456789", 9, '＠': 123456789 +"123456789", 10, '＠': ＠123456789 +"123456789", 11, '＠': ＠＠123456789 +"123456789", 20, '＠': ＠＠＠＠＠＠＠＠＠＠＠123456789 +"", 10, '＠': ＠＠＠＠＠＠＠＠＠＠ +"123456789", 0, '＠': abcdefg +"123456789", 1, '＠': abcdefg +"123456789", 5, '＠': abcdefg +"123456789", 9, '＠': ＠＠abcdefg +"123456789", 10, '＠': ＠＠＠abcdefg +"123456789", 11, '＠': ＠＠＠＠abcdefg +"123456789", 20, '＠': ＠＠＠＠＠＠＠＠＠＠＠＠＠abcdefg +---------------------------------------------------------------------------------------------------- +CustomEncode.HtmlEncode: " id="txtXXXXX" /><script type="text/javascript">alert("XSS!!!")</script><input name="txtXXXXX" type="text" value=" +---------------------------------------------------------------------------------------------------- +CustomEncode.UrlEncode: http://www.google.co.jp/search?hl=ja&q=%26 +CustomEncode.UrlEncode2: http%3A%2F%2Fwww.google.co.jp%2Fsearch%3Fhl%3Dja%26q%3D%26 +CustomEncode.UrlEncode2: http%3A%2F%2Fwww.google.co.jp%2Fsearch%3Fhl%3Dja%26q%3D%3C%3E +---------------------------------------------------------------------------------------------------- jis2k4.GetStringInfo - あああ: Char長:3; 文字列長3; バイト長6; - ----------------------------------------------------------------------------------------------------- -jis2k4.CheckSurrogatesPairChar - あああ: False -jis2k4.CheckSurrogatesPairChar - あ𩸽あ: True -jis2k4.CheckSurrogatesPairChar - あああ: -1文字目 -jis2k4.CheckSurrogatesPairChar - あ𩸽あ: 1文字目 ----------------------------------------------------------------------------------------------------- -jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: ああ -jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: あ●あ -jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: あ●あ ----------------------------------------------------------------------------------------------------- -jis2k4.CheckCharAddedWithJIS2k4 - あああ: False -jis2k4.CheckCharAddedWithJIS2k4 - あ噓あ: True -jis2k4.CheckCharAddedWithJIS2k4 - あああ: -1文字目 -jis2k4.CheckCharAddedWithJIS2k4 - あ噓あ: 1文字目 ----------------------------------------------------------------------------------------------------- -jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: ああ -jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: あ●あ -jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: あ●あ ----------------------------------------------------------------------------------------------------- -Friday > Friday -Wednesday > Wednesday -Saturday > Saturday -Friday > Friday -Saturday > Saturday -------------------------- -Friday > Friday -Wednesday > Wednesday -Saturday > Saturday -Friday > Friday -Saturday > Saturday --------------------------------------------------- -V2 > V2 -V3 > V3 -V4 > V4 -------------------------- -V2 > V2 -V3 > V3 -V4 > V4 --------------------------------------------------- -V0 > V0 -V2 > V2 -V4 > V4 -------------------------- -V0 > V0 -V2 > V2 -V4 > V4 --------------------------------------------------- -One > One -One,Two > One,Two -Three > Three -Four > Four -------------------------- -One > One -One,Two > One, Two -Three > Three -Four > Four ----------------------------------------------------------------------------------------------------- -XmlLib > is working properly. ----------------------------------------------------------------------------------------------------- -DeflateCompression(FileStream)-1 > is working properly. -DeflateCompression(FileStream)-2 > is working properly. --------------------------------------------------- -DeflateCompression(MemoryStream) > is working properly. ----------------------------------------------------------------------------------------------------- -log4net: Shutdown called on Hierarchy [log4net-default-repository] + +---------------------------------------------------------------------------------------------------- +jis2k4.CheckSurrogatesPairChar - あああ: False +jis2k4.CheckSurrogatesPairChar - あ𩸽あ: True +jis2k4.CheckSurrogatesPairChar - あああ: -1文字目 +jis2k4.CheckSurrogatesPairChar - あ𩸽あ: 1文字目 +---------------------------------------------------------------------------------------------------- +jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: ああ +jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: あ●あ +jis2k4.DeleteSurrogatesPairChar - あ𩸽あ: あ●あ +---------------------------------------------------------------------------------------------------- +jis2k4.CheckCharAddedWithJIS2k4 - あああ: False +jis2k4.CheckCharAddedWithJIS2k4 - あ噓あ: True +jis2k4.CheckCharAddedWithJIS2k4 - あああ: -1文字目 +jis2k4.CheckCharAddedWithJIS2k4 - あ噓あ: 1文字目 +---------------------------------------------------------------------------------------------------- +jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: ああ +jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: あ●あ +jis2k4.DeleteCharAddedWithJIS2k4 - あ噓あ: あ●あ +---------------------------------------------------------------------------------------------------- +Friday > Friday +Wednesday > Wednesday +Saturday > Saturday +Friday > Friday +Saturday > Saturday +------------------------- +Friday > Friday +Wednesday > Wednesday +Saturday > Saturday +Friday > Friday +Saturday > Saturday +-------------------------------------------------- +V2 > V2 +V3 > V3 +V4 > V4 +------------------------- +V2 > V2 +V3 > V3 +V4 > V4 +-------------------------------------------------- +V0 > V0 +V2 > V2 +V4 > V4 +------------------------- +V0 > V0 +V2 > V2 +V4 > V4 +-------------------------------------------------- +One > One +One,Two > One,Two +Three > Three +Four > Four +------------------------- +One > One +One,Two > One, Two +Three > Three +Four > Four +---------------------------------------------------------------------------------------------------- +XmlLib > is working properly. +---------------------------------------------------------------------------------------------------- +DeflateCompression(FileStream)-1 > is working properly. +DeflateCompression(FileStream)-2 > is working properly. +-------------------------------------------------- +DeflateCompression(MemoryStream) > is working properly. +---------------------------------------------------------------------------------------------------- + log4net: Shutdown called on Hierarchy [log4net-default-repository] diff --git a/root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore80.sln b/root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore100.sln similarity index 86% rename from root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore80.sln rename to root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore100.sln index a36dbe21e..09056c3bd 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore80.sln +++ b/root/programs/CS/Frameworks/Tests/TestCode/TestCodeCore100.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCodeCore", "core80\TestCodeCore.csproj", "{E6B7D6EE-D395-4776-ADA5-5DD0968059D8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestCodeCore", "core100\TestCodeCore.csproj", "{E6B7D6EE-D395-4776-ADA5-5DD0968059D8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestCode/TestCodeFx48.sln b/root/programs/CS/Frameworks/Tests/TestCode/TestCodeFx48.sln index 972cd6e31..8c25e357e 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/TestCodeFx48.sln +++ b/root/programs/CS/Frameworks/Tests/TestCode/TestCodeFx48.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30320.27 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCodeFx", "net48\TestCodeFx.csproj", "{7DAC4701-A800-4C8A-B70F-2A71C78F7B2F}" EndProject diff --git a/root/programs/CS/Frameworks/Tests/TestCode/core80/TestCodeCore.csproj b/root/programs/CS/Frameworks/Tests/TestCode/core100/TestCodeCore.csproj similarity index 82% rename from root/programs/CS/Frameworks/Tests/TestCode/core80/TestCodeCore.csproj rename to root/programs/CS/Frameworks/Tests/TestCode/core100/TestCodeCore.csproj index 53b3c0f51..4aae226a3 100644 --- a/root/programs/CS/Frameworks/Tests/TestCode/core80/TestCodeCore.csproj +++ b/root/programs/CS/Frameworks/Tests/TestCode/core100/TestCodeCore.csproj @@ -3,7 +3,7 @@ Exe $(NoWarn);NU1605 - net8.0 + net10.0 @@ -42,20 +42,18 @@ - - - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLog1.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLog1.sln index b9922de31..5775f7c52 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLog1.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLog1.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog", "TestLog1.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog1", "TestLog1.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLog2.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLog2.sln index f6947752b..d9f5be035 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLog2.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLog2.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog", "TestLog2.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog2", "TestLog2.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLog3.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLog3.sln index 74de0edcb..25cd4e75f 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLog3.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLog3.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog", "TestLog3.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLog3", "TestLog3.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore1.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore1.sln index 701147318..fede9134d 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore1.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore1.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore", "TestLogCore1.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore1", "TestLogCore1.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore2.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore2.sln index a6d7fab7b..eaacb151b 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore2.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore2.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore", "TestLogCore2.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore2", "TestLogCore2.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore3.sln b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore3.sln index 0675cb33e..fa72b2ffb 100644 --- a/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore3.sln +++ b/root/programs/CS/Frameworks/Tests/TestLog/TestLogCore3.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore", "TestLogCore3.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLogCore3", "TestLogCore3.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln index 08289e34c..ffdf38915 100644 --- a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln +++ b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPQuery_Tool", "DPQuery_Tool.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" EndProject diff --git a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj index 61c038f8c..fefb5ca5f 100644 --- a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj +++ b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -41,16 +41,16 @@ - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln index cf5496c65..6efff684c 100644 --- a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln +++ b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/DPQuery_ToolCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DPQuery_ToolCore", "DPQuery_ToolCore.csproj", "{1A31B69C-1DA9-4F0F-AC19-E52929285EB3}" EndProject diff --git a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs index 67cb9386f..04d7594dc 100644 --- a/root/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs +++ b/root/programs/CS/Frameworks/Tools/DPQuery_Tool/RichTextBoxDisableDF.cs @@ -31,6 +31,7 @@ //********************************************************************************** using System; +using System.ComponentModel; using System.Runtime.InteropServices; namespace DPQuery_Tool @@ -57,6 +58,7 @@ private static extern uint SendMessage(IntPtr hWnd, uint wMsg, /// ・trueにすると、従来どおり、全角と半角で別のフォントを使用 (勝手に変更される) /// ・falseにすると、全角と半角で同じフォントを使用 (勝手に変更されない) /// + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public bool DualFont { get @@ -90,6 +92,7 @@ public bool DualFont } /// WordWrap時にフォント設定がクリアされるのを防ぐ + [DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)] public new bool WordWrap { get diff --git a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln index 5bab24b9d..59a059348 100644 --- a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln +++ b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_Tool.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DaoGen_Tool", "DaoGen_Tool.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject diff --git a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj index 2ce85ac3a..e0dc773f6 100644 --- a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj +++ b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -41,16 +41,16 @@ - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln index 3a0b569d7..6df924ae5 100644 --- a/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln +++ b/root/programs/CS/Frameworks/Tools/DaoGen_Tool/DaoGen_ToolCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DaoGen_ToolCore", "DaoGen_ToolCore.csproj", "{5CC42F99-B80D-485B-9623-EE2DD59A6EDB}" EndProject diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs deleted file mode 100644 index 76e17e9d8..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/ChangeProgressParameter.cs +++ /dev/null @@ -1,52 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：ChangeProgressParameter -//* クラス日本語名 ：ChangeProgressデリゲードの引数 -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/08/01 西野 大介 新規作成 -//********************************************************************************** - -namespace DeployZipPackWithHTTP -{ - public class ChangeProgressParameter - { - /// 状態 - public string Status = null; - - /// 進捗値 - public int ProgressVal = 0; - - /// コンストラクタ - /// 状態 - /// 進捗値 - public ChangeProgressParameter(string status, int progressVal) - { - this.Status = status; - this.ProgressVal = progressVal; - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt deleted file mode 100644 index 5ddd46181..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Command line.txt +++ /dev/null @@ -1,3 +0,0 @@ -ショートカットのリンク先に設定すると楽。 - -DeployZipPackWithHTTP.exe /cui /wwwurl "http://localhost/test/test.mft" /wwwuid administrator /wwwpwd seigi \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs deleted file mode 100644 index 1620e7a95..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.Designer.cs +++ /dev/null @@ -1,68 +0,0 @@ -namespace DeployZipPackWithHTTP -{ - partial class CustMsgBox - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CustMsgBox)); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // textBox1 - // - resources.ApplyResources(this.textBox1, "textBox1"); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - // - // pictureBox1 - // - resources.ApplyResources(this.pictureBox1, "pictureBox1"); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.TabStop = false; - // - // CustMsgBox - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.textBox1); - this.Name = "CustMsgBox"; - this.Load += new System.EventHandler(this.CustMsgBox_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.PictureBox pictureBox1; - } -} \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs deleted file mode 100644 index 86004452b..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.cs +++ /dev/null @@ -1,75 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：CustMsgBox -//* クラス日本語名 ：カスタムのメッセージ ボックス画面 -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/06/16 西野 大介 新規作成 -//* 2011/07/01 西野 大介 アイコンの変更を可能に -//********************************************************************************** - -using System; -using System.Drawing; -using System.Windows.Forms; - -namespace DeployZipPackWithHTTP -{ - /// カスタムのメッセージ ボックス画面 - public partial class CustMsgBox : Form - { - /// タイトル - public string Title { set; private get; } - /// メッセージ - public string Message { set; private get; } - /// メッセージ - public Icon SysIco { set; private get; } - - /// コンストラクタ - /// タイトル - /// メッセージ - /// アイコン - public CustMsgBox(string title, string message, Icon sysIco) - { - this.Title = title; - this.Message = message; - this.SysIco = sysIco; - - InitializeComponent(); - } - - /// ロード - private void CustMsgBox_Load(object sender, EventArgs e) - { - this.Text = this.Title; - this.textBox1.Text = this.Message; - - Bitmap bmp = new Bitmap(288, 32); - Graphics g = Graphics.FromImage(bmp); - g.DrawIcon(this.SysIco, 32, 0); // SystemIcons.Error - pictureBox1.Image = bmp; - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx deleted file mode 100644 index 5fbf0a26a..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.ja-JP.resx +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - - エラー - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx deleted file mode 100644 index 8216d9c9e..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/CustMsgBox.resx +++ /dev/null @@ -1,251 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 1 - - - textBox1 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 118, 13 - - - 12, 13 - - - $this - - - - 1 - - - CustMsgBox - - - 6, 13 - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Both - - - 209, 108 - - - 0 - - - 0 - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pictureBox1 - - - Error - - - 100, 108 - - - Top, Bottom, Left, Right - - - 339, 134 - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - - True - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj deleted file mode 100644 index 86c61bb1c..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.csproj +++ /dev/null @@ -1,182 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {F0163F46-FA9D-435F-B187-EC3C1E3DF8D7} - WinExe - Properties - DeployZipPackWithHTTP - OpenTouryo.DeployZipPackWithHTTP - - - - - - - - - - - 3.5 - - - v4.8 - true - - - app.ico - - http://localhost/DeployZipPackWithHTTP/ - true - Web - true - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - true - .\ - true - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - false - - - - ..\..\Infrastructure\Build\DotNetZip.dll - - - False - ..\..\Infrastructure\Build\OpenTouryo.Business.RichClient.dll - - - False - ..\..\Infrastructure\Build\OpenTouryo.Framework.dll - - - False - ..\..\Infrastructure\Build\OpenTouryo.Framework.RichClient.dll - - - False - ..\..\Infrastructure\Build\OpenTouryo.Public.dll - - - - - - - - - - - - - Form - - - Form2.cs - - - - Form - - - CustMsgBox.cs - - - - Form - - - Form1.cs - - - - - True - True - Resource.resx - - - CustMsgBox.cs - - - Form1.cs - Always - - - Designer - Form1.cs - - - Form2.cs - - - - ResXFileCodeGenerator - Resource.Designer.cs - - - - - - - Always - - - - - CustMsgBox.cs - - - - - Form2.cs - - - Always - - - - - - - - Always - - - - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln deleted file mode 100644 index b1d0d316d..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTP.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeployZipPackWithHTTP", "DeployZipPackWithHTTP.csproj", "{F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0163F46-FA9D-435F-B187-EC3C1E3DF8D7}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {52D312DC-E37A-4F2A-AF7F-AECDC645D53F} - EndGlobalSection -EndGlobal diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln deleted file mode 100644 index 459dbdeae..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/DeployZipPackWithHTTPCore.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployZipPackWithHTTPCore", "DeployZipPackWithHTTPCore.csproj", "{B988A3B4-7296-4491-878B-7C3C2A330A1F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B988A3B4-7296-4491-878B-7C3C2A330A1F}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {A32A525E-B7F7-4751-877C-46F7BB73BCE5} - EndGlobalSection -EndGlobal diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs deleted file mode 100644 index 81b4bed91..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Entry.cs +++ /dev/null @@ -1,262 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：Entry -//* クラス日本語名 ：エントリ -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/xx/xx 西野 大介 新規作成 -//* 2011/04/25 西野 大介 IEquatableの実装（List.Remove対策） -//* ・List.Remove メソッド -//* http://msdn.microsoft.com/ja-jp/library/cd666k3e.aspx -//* ・EqualityComparer.Default プロパティ -//* http://msdn.microsoft.com/ja-jp/library/ms224763.aspx -//* ・IEquatable ジェネリック インターフェイス -//* http://msdn.microsoft.com/ja-jp/library/ms131187.aspx -//********************************************************************************** - -using System; -using System.Collections.Generic; - -namespace DeployZipPackWithHTTP -{ - /// エントリ - [Serializable()] - public class Entry : IEquatable - { - #region メンバ - - /// WWWサーバのURL - public string WWWURL { get; set; } - /// WWWサーバのユーザID - public string WWWUID { get; set; } - /// WWWサーバのパスワード - public string WWWPWD { get; set; } - /// WWWサーバのドメイン - public string WWWDomain { get; set; } - - /// ProxyサーバのURL - public string ProxyURL { get; set; } - /// ProxyサーバのユーザID - public string ProxyUID { get; set; } - /// Proxyサーバのパスワード - public string ProxyPWD { get; set; } - /// Proxyサーバのドメイン - public string ProxyDomain { get; set; } - - /// マニュフェストの最終更新日付 - public string HttpLastModified { get; set; } - - /// インストール ディレクトリ - public string InstallDir { get; set; } - /// 起動exe - public string StartExe { get; set; } - - /// ZipFileコンテンツ - public List ZipFiles { get; set; } - /// ZipFileコンテンツの最終更新日付 - public Dictionary HttpZipLastModified { get; set; } - /// ZipFileコンテンツの内容物（解凍先ファイル） - public Dictionary HttpZipContents { get; set; } - - #endregion - - /// コンストラクタ - public Entry() - { - this.ZipFiles - = new List(); - this.HttpZipLastModified - = new Dictionary(); - this.HttpZipContents - = new Dictionary(); - } - - #region IEquatableの実装 - - /// ハッシュを返す - /// ハッシュコード - /// 全メンバのハッシュコードのXOR - public override int GetHashCode() - { - int ret = 0; - //--- - if (this.WWWURL != null) - { - ret ^= this.WWWURL.GetHashCode(); - } - if (this.WWWUID != null) - { - ret ^= this.WWWUID.GetHashCode(); - } - if (this.WWWPWD != null) - { - ret ^= this.WWWPWD.GetHashCode(); - } - if (this.WWWDomain != null) - { - ret ^= this.WWWDomain.GetHashCode(); - } - //--- - if (this.ProxyURL != null) - { - ret ^= this.ProxyURL.GetHashCode(); - } - if (this.ProxyUID != null) - { - ret ^= this.ProxyUID.GetHashCode(); - } - if (this.ProxyPWD != null) - { - ret ^= this.ProxyPWD.GetHashCode(); - } - if (this.ProxyDomain != null) - { - ret ^= this.ProxyDomain.GetHashCode(); - } - //--- - if (this.HttpLastModified != null) - { - ret ^= this.HttpLastModified.GetHashCode(); - } - //--- - if (this.InstallDir != null) - { - ret ^= this.InstallDir.GetHashCode(); - } - if (this.StartExe != null) - { - ret ^= this.StartExe.GetHashCode(); - } - //--- - if (this.ZipFiles != null) - { - ret ^= this.ZipFiles.GetHashCode(); - } - if (this.HttpZipLastModified != null) - { - ret ^= this.HttpZipLastModified.GetHashCode(); - } - if (this.HttpZipContents != null) - { - ret ^= this.HttpZipContents.GetHashCode(); - } - - return ret; - } - - /// Equals - /// Entry - /// - /// true：等しい - /// false：等しくない - /// - /// 全メンバの==のAND - public bool Equals(Entry entry) - { - // null対応 - if (entry == null) { return false; } - - // 一意性の保障はWWWURL（ID）だけで判断可能。 - return - (this.WWWURL == entry.WWWURL); - } - - /// Equals - /// Entry - /// - /// true：等しい - /// false：等しくない - /// - public override bool Equals(Object obj) - { - if (obj == null) - { - // nullの場合（ベースへ） - return base.Equals(obj); - } - else - { - // nullでない場合 - if (!(obj is Entry)) - { - // 型が違う - return false; - } - else - { - // 型が一致（オーバロードヘ） - return Equals(obj as Entry); - } - } - } - - /// 比較演算子（==） - /// 右辺 - /// 左辺 - /// - /// true：等しい - /// false：等しくない - /// - public static bool operator ==(Entry l, Entry r) - { - // Check for null on left side. - if (Object.ReferenceEquals(l, null)) - { - // Check for null on right side. - if (Object.ReferenceEquals(r, null)) - { - // null == null = true. - return true; - } - else - { - // Only the left side is null. - return false; - } - } - else - { - // Equals handles case of null on right side. - return l.Equals(r); - } - } - - /// 比較演算子（!=） - /// 右辺 - /// 左辺 - /// - /// true：等しい - /// false：等しくない - /// - public static bool operator !=(Entry l, Entry r) - { - // ==演算子の逆 - return !(l == r); - } - - #endregion - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs deleted file mode 100644 index 04b19daee..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.Designer.cs +++ /dev/null @@ -1,695 +0,0 @@ -namespace DeployZipPackWithHTTP -{ - partial class Form1 - { - /// - /// 必要なデザイナ変数です。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 使用中のリソースをすべてクリーンアップします。 - /// - /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows フォーム デザイナで生成されたコード - - /// - /// デザイナ サポートに必要なメソッドです。このメソッドの内容を - /// コード エディタで変更しないでください。 - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1)); - this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); - this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); - this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.lblStatus = new System.Windows.Forms.Label(); - this.openFilesDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.panel1 = new System.Windows.Forms.Panel(); - this.tabDeployZipPac = new System.Windows.Forms.TabControl(); - this.tabPageDeployWithHTTP = new System.Windows.Forms.TabPage(); - this.btnDelHistory = new System.Windows.Forms.Button(); - this.lblHistorys = new System.Windows.Forms.Label(); - this.cmbHistorys = new System.Windows.Forms.ComboBox(); - this.btnCheckUpdateAndInstall = new System.Windows.Forms.Button(); - this.gbxWWW = new System.Windows.Forms.GroupBox(); - this.txtURL = new System.Windows.Forms.TextBox(); - this.txtDomain = new System.Windows.Forms.TextBox(); - this.lblDomain = new System.Windows.Forms.Label(); - this.lblURL = new System.Windows.Forms.Label(); - this.txtPWD = new System.Windows.Forms.TextBox(); - this.lblPWD = new System.Windows.Forms.Label(); - this.lblUID = new System.Windows.Forms.Label(); - this.txtUID = new System.Windows.Forms.TextBox(); - this.gbxProxy = new System.Windows.Forms.GroupBox(); - this.txtProxyDomain = new System.Windows.Forms.TextBox(); - this.lblProxyDomain = new System.Windows.Forms.Label(); - this.lblProxyPWD = new System.Windows.Forms.Label(); - this.txtProxyURL = new System.Windows.Forms.TextBox(); - this.txtProxyPWD = new System.Windows.Forms.TextBox(); - this.lblProxyURL = new System.Windows.Forms.Label(); - this.txtProxyUID = new System.Windows.Forms.TextBox(); - this.lblProxyUID = new System.Windows.Forms.Label(); - this.tabPageZipPackage = new System.Windows.Forms.TabPage(); - this.lblFolder = new System.Windows.Forms.Label(); - this.txtFile = new System.Windows.Forms.TextBox(); - this.lblFile = new System.Windows.Forms.Label(); - this.txtPass = new System.Windows.Forms.TextBox(); - this.lblEnc = new System.Windows.Forms.Label(); - this.btnSelectFolder = new System.Windows.Forms.Button(); - this.lblExt = new System.Windows.Forms.Label(); - this.btnSelectSaveFile = new System.Windows.Forms.Button(); - this.cbxExt = new System.Windows.Forms.CheckBox(); - this.txtExt = new System.Windows.Forms.TextBox(); - this.tabZipUnZip = new System.Windows.Forms.TabControl(); - this.tabPageZip = new System.Windows.Forms.TabPage(); - this.lblRootDirCheck = new System.Windows.Forms.Label(); - this.cbxRootDir = new System.Windows.Forms.CheckBox(); - this.cbxFormat = new System.Windows.Forms.CheckBox(); - this.btnCompress = new System.Windows.Forms.Button(); - this.cmbFormat = new System.Windows.Forms.ComboBox(); - this.lblFormat = new System.Windows.Forms.Label(); - this.cmbCmpLv = new System.Windows.Forms.ComboBox(); - this.lblCyp = new System.Windows.Forms.Label(); - this.lblCmpLv = new System.Windows.Forms.Label(); - this.cmbCyp = new System.Windows.Forms.ComboBox(); - this.tabPageUnZip = new System.Windows.Forms.TabPage(); - this.btnDecomp = new System.Windows.Forms.Button(); - this.lblEEFA = new System.Windows.Forms.Label(); - this.cmbEEFA = new System.Windows.Forms.ComboBox(); - this.cmbEnc = new System.Windows.Forms.ComboBox(); - this.lblPass = new System.Windows.Forms.Label(); - this.txtFolder = new System.Windows.Forms.TextBox(); - this.tabPageManifesto = new System.Windows.Forms.TabPage(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.lblInsDir = new System.Windows.Forms.Label(); - this.txtInsDir = new System.Windows.Forms.TextBox(); - this.lblExeName = new System.Windows.Forms.Label(); - this.txtExeName = new System.Windows.Forms.TextBox(); - this.btnCreateManifesto = new System.Windows.Forms.Button(); - this.btnRemoveZIPFile = new System.Windows.Forms.Button(); - this.btnAddZIPFile = new System.Windows.Forms.Button(); - this.lbxZIPFiles = new System.Windows.Forms.ListBox(); - this.panel1.SuspendLayout(); - this.tabDeployZipPac.SuspendLayout(); - this.tabPageDeployWithHTTP.SuspendLayout(); - this.gbxWWW.SuspendLayout(); - this.gbxProxy.SuspendLayout(); - this.tabPageZipPackage.SuspendLayout(); - this.tabZipUnZip.SuspendLayout(); - this.tabPageZip.SuspendLayout(); - this.tabPageUnZip.SuspendLayout(); - this.tabPageManifesto.SuspendLayout(); - this.SuspendLayout(); - // - // folderBrowserDialog1 - // - resources.ApplyResources(this.folderBrowserDialog1, "folderBrowserDialog1"); - // - // saveFileDialog1 - // - resources.ApplyResources(this.saveFileDialog1, "saveFileDialog1"); - // - // openFileDialog1 - // - this.openFileDialog1.FileName = "openFileDialog1"; - resources.ApplyResources(this.openFileDialog1, "openFileDialog1"); - // - // lblStatus - // - resources.ApplyResources(this.lblStatus, "lblStatus"); - this.lblStatus.Name = "lblStatus"; - // - // openFilesDialog1 - // - this.openFilesDialog1.FileName = "openFilesDialog1"; - resources.ApplyResources(this.openFilesDialog1, "openFilesDialog1"); - this.openFilesDialog1.Multiselect = true; - // - // panel1 - // - resources.ApplyResources(this.panel1, "panel1"); - this.panel1.Controls.Add(this.tabDeployZipPac); - this.panel1.Name = "panel1"; - // - // tabDeployZipPac - // - resources.ApplyResources(this.tabDeployZipPac, "tabDeployZipPac"); - this.tabDeployZipPac.Controls.Add(this.tabPageDeployWithHTTP); - this.tabDeployZipPac.Controls.Add(this.tabPageZipPackage); - this.tabDeployZipPac.Controls.Add(this.tabPageManifesto); - this.tabDeployZipPac.Name = "tabDeployZipPac"; - this.tabDeployZipPac.SelectedIndex = 0; - // - // tabPageDeployWithHTTP - // - resources.ApplyResources(this.tabPageDeployWithHTTP, "tabPageDeployWithHTTP"); - this.tabPageDeployWithHTTP.Controls.Add(this.btnDelHistory); - this.tabPageDeployWithHTTP.Controls.Add(this.lblHistorys); - this.tabPageDeployWithHTTP.Controls.Add(this.cmbHistorys); - this.tabPageDeployWithHTTP.Controls.Add(this.btnCheckUpdateAndInstall); - this.tabPageDeployWithHTTP.Controls.Add(this.gbxWWW); - this.tabPageDeployWithHTTP.Controls.Add(this.gbxProxy); - this.tabPageDeployWithHTTP.Name = "tabPageDeployWithHTTP"; - this.tabPageDeployWithHTTP.UseVisualStyleBackColor = true; - // - // btnDelHistory - // - resources.ApplyResources(this.btnDelHistory, "btnDelHistory"); - this.btnDelHistory.Name = "btnDelHistory"; - this.btnDelHistory.UseVisualStyleBackColor = true; - this.btnDelHistory.Click += new System.EventHandler(this.btnDelHistory_Click); - // - // lblHistorys - // - resources.ApplyResources(this.lblHistorys, "lblHistorys"); - this.lblHistorys.Name = "lblHistorys"; - // - // cmbHistorys - // - resources.ApplyResources(this.cmbHistorys, "cmbHistorys"); - this.cmbHistorys.FormattingEnabled = true; - this.cmbHistorys.Name = "cmbHistorys"; - this.cmbHistorys.SelectedIndexChanged += new System.EventHandler(this.cmbHistorys_SelectedIndexChanged); - // - // btnCheckUpdateAndInstall - // - resources.ApplyResources(this.btnCheckUpdateAndInstall, "btnCheckUpdateAndInstall"); - this.btnCheckUpdateAndInstall.Name = "btnCheckUpdateAndInstall"; - this.btnCheckUpdateAndInstall.UseVisualStyleBackColor = true; - this.btnCheckUpdateAndInstall.Click += new System.EventHandler(this.btnCheckUpdateAndInstall_Click); - // - // gbxWWW - // - resources.ApplyResources(this.gbxWWW, "gbxWWW"); - this.gbxWWW.Controls.Add(this.txtURL); - this.gbxWWW.Controls.Add(this.txtDomain); - this.gbxWWW.Controls.Add(this.lblDomain); - this.gbxWWW.Controls.Add(this.lblURL); - this.gbxWWW.Controls.Add(this.txtPWD); - this.gbxWWW.Controls.Add(this.lblPWD); - this.gbxWWW.Controls.Add(this.lblUID); - this.gbxWWW.Controls.Add(this.txtUID); - this.gbxWWW.Name = "gbxWWW"; - this.gbxWWW.TabStop = false; - // - // txtURL - // - resources.ApplyResources(this.txtURL, "txtURL"); - this.txtURL.Name = "txtURL"; - // - // txtDomain - // - resources.ApplyResources(this.txtDomain, "txtDomain"); - this.txtDomain.Name = "txtDomain"; - // - // lblDomain - // - resources.ApplyResources(this.lblDomain, "lblDomain"); - this.lblDomain.Name = "lblDomain"; - // - // lblURL - // - resources.ApplyResources(this.lblURL, "lblURL"); - this.lblURL.Name = "lblURL"; - // - // txtPWD - // - resources.ApplyResources(this.txtPWD, "txtPWD"); - this.txtPWD.Name = "txtPWD"; - // - // lblPWD - // - resources.ApplyResources(this.lblPWD, "lblPWD"); - this.lblPWD.Name = "lblPWD"; - // - // lblUID - // - resources.ApplyResources(this.lblUID, "lblUID"); - this.lblUID.Name = "lblUID"; - // - // txtUID - // - resources.ApplyResources(this.txtUID, "txtUID"); - this.txtUID.Name = "txtUID"; - // - // gbxProxy - // - resources.ApplyResources(this.gbxProxy, "gbxProxy"); - this.gbxProxy.Controls.Add(this.txtProxyDomain); - this.gbxProxy.Controls.Add(this.lblProxyDomain); - this.gbxProxy.Controls.Add(this.lblProxyPWD); - this.gbxProxy.Controls.Add(this.txtProxyURL); - this.gbxProxy.Controls.Add(this.txtProxyPWD); - this.gbxProxy.Controls.Add(this.lblProxyURL); - this.gbxProxy.Controls.Add(this.txtProxyUID); - this.gbxProxy.Controls.Add(this.lblProxyUID); - this.gbxProxy.Name = "gbxProxy"; - this.gbxProxy.TabStop = false; - // - // txtProxyDomain - // - resources.ApplyResources(this.txtProxyDomain, "txtProxyDomain"); - this.txtProxyDomain.Name = "txtProxyDomain"; - // - // lblProxyDomain - // - resources.ApplyResources(this.lblProxyDomain, "lblProxyDomain"); - this.lblProxyDomain.Name = "lblProxyDomain"; - // - // lblProxyPWD - // - resources.ApplyResources(this.lblProxyPWD, "lblProxyPWD"); - this.lblProxyPWD.Name = "lblProxyPWD"; - // - // txtProxyURL - // - resources.ApplyResources(this.txtProxyURL, "txtProxyURL"); - this.txtProxyURL.Name = "txtProxyURL"; - // - // txtProxyPWD - // - resources.ApplyResources(this.txtProxyPWD, "txtProxyPWD"); - this.txtProxyPWD.Name = "txtProxyPWD"; - // - // lblProxyURL - // - resources.ApplyResources(this.lblProxyURL, "lblProxyURL"); - this.lblProxyURL.Name = "lblProxyURL"; - // - // txtProxyUID - // - resources.ApplyResources(this.txtProxyUID, "txtProxyUID"); - this.txtProxyUID.Name = "txtProxyUID"; - // - // lblProxyUID - // - resources.ApplyResources(this.lblProxyUID, "lblProxyUID"); - this.lblProxyUID.Name = "lblProxyUID"; - // - // tabPageZipPackage - // - resources.ApplyResources(this.tabPageZipPackage, "tabPageZipPackage"); - this.tabPageZipPackage.Controls.Add(this.lblFolder); - this.tabPageZipPackage.Controls.Add(this.txtFile); - this.tabPageZipPackage.Controls.Add(this.lblFile); - this.tabPageZipPackage.Controls.Add(this.txtPass); - this.tabPageZipPackage.Controls.Add(this.lblEnc); - this.tabPageZipPackage.Controls.Add(this.btnSelectFolder); - this.tabPageZipPackage.Controls.Add(this.lblExt); - this.tabPageZipPackage.Controls.Add(this.btnSelectSaveFile); - this.tabPageZipPackage.Controls.Add(this.cbxExt); - this.tabPageZipPackage.Controls.Add(this.txtExt); - this.tabPageZipPackage.Controls.Add(this.tabZipUnZip); - this.tabPageZipPackage.Controls.Add(this.cmbEnc); - this.tabPageZipPackage.Controls.Add(this.lblPass); - this.tabPageZipPackage.Controls.Add(this.txtFolder); - this.tabPageZipPackage.Name = "tabPageZipPackage"; - this.tabPageZipPackage.UseVisualStyleBackColor = true; - // - // lblFolder - // - resources.ApplyResources(this.lblFolder, "lblFolder"); - this.lblFolder.Name = "lblFolder"; - // - // txtFile - // - resources.ApplyResources(this.txtFile, "txtFile"); - this.txtFile.Name = "txtFile"; - // - // lblFile - // - resources.ApplyResources(this.lblFile, "lblFile"); - this.lblFile.Name = "lblFile"; - // - // txtPass - // - resources.ApplyResources(this.txtPass, "txtPass"); - this.txtPass.Name = "txtPass"; - // - // lblEnc - // - resources.ApplyResources(this.lblEnc, "lblEnc"); - this.lblEnc.Name = "lblEnc"; - // - // btnSelectFolder - // - resources.ApplyResources(this.btnSelectFolder, "btnSelectFolder"); - this.btnSelectFolder.Name = "btnSelectFolder"; - this.btnSelectFolder.UseVisualStyleBackColor = true; - this.btnSelectFolder.Click += new System.EventHandler(this.btnSelectFolder_Click); - // - // lblExt - // - resources.ApplyResources(this.lblExt, "lblExt"); - this.lblExt.Name = "lblExt"; - // - // btnSelectSaveFile - // - resources.ApplyResources(this.btnSelectSaveFile, "btnSelectSaveFile"); - this.btnSelectSaveFile.Name = "btnSelectSaveFile"; - this.btnSelectSaveFile.UseVisualStyleBackColor = true; - this.btnSelectSaveFile.Click += new System.EventHandler(this.btnSelectSaveFile_Click); - // - // cbxExt - // - resources.ApplyResources(this.cbxExt, "cbxExt"); - this.cbxExt.Name = "cbxExt"; - this.cbxExt.UseVisualStyleBackColor = true; - this.cbxExt.CheckedChanged += new System.EventHandler(this.cbxExt_CheckedChanged); - // - // txtExt - // - resources.ApplyResources(this.txtExt, "txtExt"); - this.txtExt.Name = "txtExt"; - // - // tabZipUnZip - // - resources.ApplyResources(this.tabZipUnZip, "tabZipUnZip"); - this.tabZipUnZip.Controls.Add(this.tabPageZip); - this.tabZipUnZip.Controls.Add(this.tabPageUnZip); - this.tabZipUnZip.Name = "tabZipUnZip"; - this.tabZipUnZip.SelectedIndex = 0; - // - // tabPageZip - // - resources.ApplyResources(this.tabPageZip, "tabPageZip"); - this.tabPageZip.Controls.Add(this.lblRootDirCheck); - this.tabPageZip.Controls.Add(this.cbxRootDir); - this.tabPageZip.Controls.Add(this.cbxFormat); - this.tabPageZip.Controls.Add(this.btnCompress); - this.tabPageZip.Controls.Add(this.cmbFormat); - this.tabPageZip.Controls.Add(this.lblFormat); - this.tabPageZip.Controls.Add(this.cmbCmpLv); - this.tabPageZip.Controls.Add(this.lblCyp); - this.tabPageZip.Controls.Add(this.lblCmpLv); - this.tabPageZip.Controls.Add(this.cmbCyp); - this.tabPageZip.Name = "tabPageZip"; - this.tabPageZip.UseVisualStyleBackColor = true; - // - // lblRootDirCheck - // - resources.ApplyResources(this.lblRootDirCheck, "lblRootDirCheck"); - this.lblRootDirCheck.Name = "lblRootDirCheck"; - // - // cbxRootDir - // - resources.ApplyResources(this.cbxRootDir, "cbxRootDir"); - this.cbxRootDir.Name = "cbxRootDir"; - this.cbxRootDir.UseVisualStyleBackColor = true; - // - // cbxFormat - // - resources.ApplyResources(this.cbxFormat, "cbxFormat"); - this.cbxFormat.Name = "cbxFormat"; - this.cbxFormat.UseVisualStyleBackColor = true; - this.cbxFormat.CheckedChanged += new System.EventHandler(this.cmbFormat_CheckedChanged); - // - // btnCompress - // - resources.ApplyResources(this.btnCompress, "btnCompress"); - this.btnCompress.Name = "btnCompress"; - this.btnCompress.UseVisualStyleBackColor = true; - this.btnCompress.Click += new System.EventHandler(this.btnCompress_Click); - // - // cmbFormat - // - resources.ApplyResources(this.cmbFormat, "cmbFormat"); - this.cmbFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbFormat.FormattingEnabled = true; - this.cmbFormat.Name = "cmbFormat"; - // - // lblFormat - // - resources.ApplyResources(this.lblFormat, "lblFormat"); - this.lblFormat.Name = "lblFormat"; - // - // cmbCmpLv - // - resources.ApplyResources(this.cmbCmpLv, "cmbCmpLv"); - this.cmbCmpLv.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbCmpLv.FormattingEnabled = true; - this.cmbCmpLv.Name = "cmbCmpLv"; - // - // lblCyp - // - resources.ApplyResources(this.lblCyp, "lblCyp"); - this.lblCyp.Name = "lblCyp"; - // - // lblCmpLv - // - resources.ApplyResources(this.lblCmpLv, "lblCmpLv"); - this.lblCmpLv.Name = "lblCmpLv"; - // - // cmbCyp - // - resources.ApplyResources(this.cmbCyp, "cmbCyp"); - this.cmbCyp.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbCyp.FormattingEnabled = true; - this.cmbCyp.Name = "cmbCyp"; - // - // tabPageUnZip - // - resources.ApplyResources(this.tabPageUnZip, "tabPageUnZip"); - this.tabPageUnZip.Controls.Add(this.btnDecomp); - this.tabPageUnZip.Controls.Add(this.lblEEFA); - this.tabPageUnZip.Controls.Add(this.cmbEEFA); - this.tabPageUnZip.Name = "tabPageUnZip"; - this.tabPageUnZip.UseVisualStyleBackColor = true; - // - // btnDecomp - // - resources.ApplyResources(this.btnDecomp, "btnDecomp"); - this.btnDecomp.Name = "btnDecomp"; - this.btnDecomp.UseVisualStyleBackColor = true; - this.btnDecomp.Click += new System.EventHandler(this.btnDecomp_Click); - // - // lblEEFA - // - resources.ApplyResources(this.lblEEFA, "lblEEFA"); - this.lblEEFA.Name = "lblEEFA"; - // - // cmbEEFA - // - resources.ApplyResources(this.cmbEEFA, "cmbEEFA"); - this.cmbEEFA.FormattingEnabled = true; - this.cmbEEFA.Name = "cmbEEFA"; - // - // cmbEnc - // - resources.ApplyResources(this.cmbEnc, "cmbEnc"); - this.cmbEnc.FormattingEnabled = true; - this.cmbEnc.Items.AddRange(new object[] { - resources.GetString("cmbEnc.Items"), - resources.GetString("cmbEnc.Items1"), - resources.GetString("cmbEnc.Items2")}); - this.cmbEnc.Name = "cmbEnc"; - // - // lblPass - // - resources.ApplyResources(this.lblPass, "lblPass"); - this.lblPass.Name = "lblPass"; - // - // txtFolder - // - resources.ApplyResources(this.txtFolder, "txtFolder"); - this.txtFolder.Name = "txtFolder"; - // - // tabPageManifesto - // - resources.ApplyResources(this.tabPageManifesto, "tabPageManifesto"); - this.tabPageManifesto.Controls.Add(this.label3); - this.tabPageManifesto.Controls.Add(this.label2); - this.tabPageManifesto.Controls.Add(this.label1); - this.tabPageManifesto.Controls.Add(this.lblInsDir); - this.tabPageManifesto.Controls.Add(this.txtInsDir); - this.tabPageManifesto.Controls.Add(this.lblExeName); - this.tabPageManifesto.Controls.Add(this.txtExeName); - this.tabPageManifesto.Controls.Add(this.btnCreateManifesto); - this.tabPageManifesto.Controls.Add(this.btnRemoveZIPFile); - this.tabPageManifesto.Controls.Add(this.btnAddZIPFile); - this.tabPageManifesto.Controls.Add(this.lbxZIPFiles); - this.tabPageManifesto.Name = "tabPageManifesto"; - this.tabPageManifesto.UseVisualStyleBackColor = true; - // - // label3 - // - resources.ApplyResources(this.label3, "label3"); - this.label3.Name = "label3"; - // - // label2 - // - resources.ApplyResources(this.label2, "label2"); - this.label2.Name = "label2"; - // - // label1 - // - resources.ApplyResources(this.label1, "label1"); - this.label1.Name = "label1"; - // - // lblInsDir - // - resources.ApplyResources(this.lblInsDir, "lblInsDir"); - this.lblInsDir.Name = "lblInsDir"; - // - // txtInsDir - // - resources.ApplyResources(this.txtInsDir, "txtInsDir"); - this.txtInsDir.Name = "txtInsDir"; - // - // lblExeName - // - resources.ApplyResources(this.lblExeName, "lblExeName"); - this.lblExeName.Name = "lblExeName"; - // - // txtExeName - // - resources.ApplyResources(this.txtExeName, "txtExeName"); - this.txtExeName.Name = "txtExeName"; - // - // btnCreateManifesto - // - resources.ApplyResources(this.btnCreateManifesto, "btnCreateManifesto"); - this.btnCreateManifesto.Name = "btnCreateManifesto"; - this.btnCreateManifesto.UseVisualStyleBackColor = true; - this.btnCreateManifesto.Click += new System.EventHandler(this.btnCreateManifesto_Click); - // - // btnRemoveZIPFile - // - resources.ApplyResources(this.btnRemoveZIPFile, "btnRemoveZIPFile"); - this.btnRemoveZIPFile.Name = "btnRemoveZIPFile"; - this.btnRemoveZIPFile.UseVisualStyleBackColor = true; - this.btnRemoveZIPFile.Click += new System.EventHandler(this.btnRemoveZIPFile_Click); - // - // btnAddZIPFile - // - resources.ApplyResources(this.btnAddZIPFile, "btnAddZIPFile"); - this.btnAddZIPFile.Name = "btnAddZIPFile"; - this.btnAddZIPFile.UseVisualStyleBackColor = true; - this.btnAddZIPFile.Click += new System.EventHandler(this.btnAddZIPFile_Click); - // - // lbxZIPFiles - // - resources.ApplyResources(this.lbxZIPFiles, "lbxZIPFiles"); - this.lbxZIPFiles.FormattingEnabled = true; - this.lbxZIPFiles.Name = "lbxZIPFiles"; - // - // Form1 - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.panel1); - this.Controls.Add(this.lblStatus); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.Name = "Form1"; - this.Load += new System.EventHandler(this.Form1_Load); - this.panel1.ResumeLayout(false); - this.tabDeployZipPac.ResumeLayout(false); - this.tabPageDeployWithHTTP.ResumeLayout(false); - this.tabPageDeployWithHTTP.PerformLayout(); - this.gbxWWW.ResumeLayout(false); - this.gbxWWW.PerformLayout(); - this.gbxProxy.ResumeLayout(false); - this.gbxProxy.PerformLayout(); - this.tabPageZipPackage.ResumeLayout(false); - this.tabPageZipPackage.PerformLayout(); - this.tabZipUnZip.ResumeLayout(false); - this.tabPageZip.ResumeLayout(false); - this.tabPageZip.PerformLayout(); - this.tabPageUnZip.ResumeLayout(false); - this.tabPageUnZip.PerformLayout(); - this.tabPageManifesto.ResumeLayout(false); - this.tabPageManifesto.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog1; - private System.Windows.Forms.SaveFileDialog saveFileDialog1; - private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.Label lblStatus; - private System.Windows.Forms.OpenFileDialog openFilesDialog1; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TabControl tabDeployZipPac; - private System.Windows.Forms.TabPage tabPageDeployWithHTTP; - private System.Windows.Forms.Button btnDelHistory; - private System.Windows.Forms.Label lblHistorys; - private System.Windows.Forms.ComboBox cmbHistorys; - private System.Windows.Forms.Button btnCheckUpdateAndInstall; - private System.Windows.Forms.GroupBox gbxWWW; - private System.Windows.Forms.TextBox txtURL; - private System.Windows.Forms.TextBox txtDomain; - private System.Windows.Forms.Label lblDomain; - private System.Windows.Forms.Label lblURL; - private System.Windows.Forms.TextBox txtPWD; - private System.Windows.Forms.Label lblPWD; - private System.Windows.Forms.Label lblUID; - private System.Windows.Forms.TextBox txtUID; - private System.Windows.Forms.GroupBox gbxProxy; - private System.Windows.Forms.TextBox txtProxyDomain; - private System.Windows.Forms.Label lblProxyDomain; - private System.Windows.Forms.Label lblProxyPWD; - private System.Windows.Forms.TextBox txtProxyURL; - private System.Windows.Forms.TextBox txtProxyPWD; - private System.Windows.Forms.Label lblProxyURL; - private System.Windows.Forms.TextBox txtProxyUID; - private System.Windows.Forms.Label lblProxyUID; - private System.Windows.Forms.TabPage tabPageZipPackage; - private System.Windows.Forms.Label lblFolder; - private System.Windows.Forms.TextBox txtFile; - private System.Windows.Forms.Label lblFile; - private System.Windows.Forms.TextBox txtPass; - private System.Windows.Forms.Label lblEnc; - private System.Windows.Forms.Button btnSelectFolder; - private System.Windows.Forms.Label lblExt; - private System.Windows.Forms.Button btnSelectSaveFile; - private System.Windows.Forms.CheckBox cbxExt; - private System.Windows.Forms.TextBox txtExt; - private System.Windows.Forms.TabControl tabZipUnZip; - private System.Windows.Forms.TabPage tabPageZip; - private System.Windows.Forms.CheckBox cbxRootDir; - private System.Windows.Forms.CheckBox cbxFormat; - private System.Windows.Forms.Button btnCompress; - private System.Windows.Forms.ComboBox cmbFormat; - private System.Windows.Forms.Label lblFormat; - private System.Windows.Forms.ComboBox cmbCmpLv; - private System.Windows.Forms.Label lblCyp; - private System.Windows.Forms.Label lblCmpLv; - private System.Windows.Forms.ComboBox cmbCyp; - private System.Windows.Forms.TabPage tabPageUnZip; - private System.Windows.Forms.Button btnDecomp; - private System.Windows.Forms.Label lblEEFA; - private System.Windows.Forms.ComboBox cmbEEFA; - private System.Windows.Forms.ComboBox cmbEnc; - private System.Windows.Forms.Label lblPass; - private System.Windows.Forms.TextBox txtFolder; - private System.Windows.Forms.TabPage tabPageManifesto; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Label lblInsDir; - private System.Windows.Forms.TextBox txtInsDir; - private System.Windows.Forms.Label lblExeName; - private System.Windows.Forms.TextBox txtExeName; - private System.Windows.Forms.Button btnCreateManifesto; - private System.Windows.Forms.Button btnRemoveZIPFile; - private System.Windows.Forms.Button btnAddZIPFile; - private System.Windows.Forms.ListBox lbxZIPFiles; - private System.Windows.Forms.Label lblRootDirCheck; - private System.Windows.Forms.Label label3; - } -} - diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs deleted file mode 100644 index 2ea862132..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.cs +++ /dev/null @@ -1,762 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：Form1 -//* クラス日本語名 ：メイン画面 -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/04/18 西野 大介 新規作成 -//* 2011/07/01 西野 大介 履歴コンボは都度クリア -//* 2011/07/04 西野 大介 圧縮・解凍に入力チェック＋例外処理を追加 -//* 2011/07/04 西野 大介 マニュフェスト作成に入力チェック＋例外処理を追加 -//* 2011/08/30 西野 大介 異常終了時に退避ディレクトリからリカバリ。 -//* 2011/08/30 西野 大介 テンポラリの削除処理を追加した（例外処理を追加）。 -//* 2011/08/30 西野 大介 ファイル ダイアログのリセット処理を追加した。 -//* 2011/08/30 西野 大介 ChangeProgressParameterの使用に漏れがあった。 -//* 2011/09/05 西野 大介 GCするコードを追加→修正（解凍ZIPがCloseされないため） -//* 2011/09/08 西野 大介 リカバリ処理のログ出力位置の変更 -//* （リカバリしない時ログを出力しないよう変更）。 -//* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 -//* 2014/04/24 Sai For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call -//* Moved all the Japanese language exception messages to MSGDefinition_ja-JP.xml file Placed all the converted -//* Japanese language exception messages to MSGDefinition.xml file for internationalization supporting English Language. -//* 2014/04/25 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call -//* 2020/08/03 西野 大介 NETCOREAPP対応 -//********************************************************************************** - -using System; -using System.IO; -using System.Text; -using System.Drawing; -using System.Resources; -using System.Windows.Forms; - -using Ionic.Zip; -using Ionic.Zlib; - -using Touryo.Infrastructure.Business.RichClient.Asynchronous; -using Touryo.Infrastructure.Framework.RichClient.Asynchronous; -using Touryo.Infrastructure.Framework.Util; -using Touryo.Infrastructure.Public.IO; -using Touryo.Infrastructure.Public.Str; - -namespace DeployZipPackWithHTTP -{ - /// メイン画面 - public partial class Form1 : Form - { - /// ステータス表示用 - public string Status - { - set - { - this.lblStatus.Text = value; - } - get - { - return this.lblStatus.Text; - } - } - - /// - /// Getting ResourceManager instance from Resources to apply internationalization - /// - private ResourceManager ResourceMgr - { - get - { - return Resources.Resource.ResourceManager; - } - } - - #region 初期処理 - - /// コンストラクタ - public Form1() - { - InitializeComponent(); - } - - /// 画面ロード - private void Form1_Load(object sender, EventArgs e) - { - // デプロイ - - // 列挙型設定 - this.cmbEnc.SelectedIndex = 0; - this.cmbCyp.DataSource = Enum.GetValues(typeof(EncryptionAlgorithm)); - this.cmbCmpLv.DataSource = Enum.GetValues(typeof(CompressionLevel)); -#if NETCOREAPP -#else - this.cmbFormat.DataSource = Enum.GetValues(typeof(SelfExtractorFlavor)); -#endif - this.cmbEEFA.DataSource = Enum.GetValues(typeof(ExtractExistingFileAction)); - - // ZIP作成 - this.txtExt.Text = "txt,csv,cs"; - - this.txtExt.Enabled = false; - this.cmbFormat.Enabled = false; - - // 声明文作成 - - //--- - - // 履歴を復元 - this.LoadBins(); - } - - /// 履歴で初期化 - private void cmbHistorys_SelectedIndexChanged(object sender, EventArgs e) - { - // 履歴で初期化 - Entry entry = null; - - foreach (Entry temp in Program.Histories) - { - if (this.cmbHistorys.Text == temp.WWWURL) - { - entry = temp; - } - } - - if (entry != null) - { - this.txtURL.Text = entry.WWWURL; - this.txtUID.Text = entry.WWWUID; - this.txtPWD.Text = entry.WWWPWD; - this.txtDomain.Text = entry.WWWDomain; - - this.txtProxyURL.Text = entry.ProxyURL; - this.txtProxyUID.Text = entry.ProxyUID; - this.txtProxyPWD.Text = entry.ProxyPWD; - this.txtProxyDomain.Text = entry.ProxyDomain; - } - } - - #region データ ロード - - /// バイナリファイルをロード - private void LoadBins() - { - this.LoadEntry(); - this.LoadHistories(); - - this.Refresh(); - } - - /// エントリのロード - private void LoadEntry() - { - // current.bin（前回入力） - Entry entry = Program.LoadCurrent(); - - // 設定 - if (entry != null) - { - this.txtURL.Text = entry.WWWURL; - this.txtUID.Text = entry.WWWUID; - this.txtPWD.Text = entry.WWWPWD; - this.txtDomain.Text = entry.WWWDomain; - - this.txtProxyURL.Text = entry.ProxyURL; - this.txtProxyUID.Text = entry.ProxyUID; - this.txtProxyPWD.Text = entry.ProxyPWD; - this.txtProxyDomain.Text = entry.ProxyDomain; - } - } - - /// 履歴のロード - private void LoadHistories() - { - // histories.bin（履歴） - //Program.Histories = Program.LoadHistories(); - Program.LoadHistories(); - - // 設定 - this.cmbHistorys.Items.Clear(); - if (Program.Histories != null) - { - foreach (Entry history in Program.Histories) - { - this.cmbHistorys.Items.Add(history.WWWURL); - } - } - //else - //{ - // Program.Histories = new List(); - //} - } - - #endregion - - #endregion - - #region 圧縮・解凍 - - /// 圧縮処理 - private void btnCompress_Click(object sender, EventArgs e) - { - try - { - // チェック処理 - this.CheckComp_DeComp(); - - // 圧縮部品 - Zipper z = new Zipper(); - - // 選択基準 - string[] exts = null; - Zipper.SelectionDelegate scd = null; - - if (this.txtExt.Enabled) - { - exts = this.txtExt.Text.Split(','); - scd = Program.SelectionCriteriaDlgt1; - } - - // 形式指定 -#if NETCOREAPP -#else - SelfExtractorFlavor? selfEx = null; - - if (this.cmbFormat.Enabled) - { selfEx = (SelfExtractorFlavor)this.cmbFormat.SelectedItem; } -#endif - - // ZIP内パスのルート名 - string[] temp = this.txtFile.Text.Split('\\'); - - // 進捗報告処理 - z.SaveProgress = Program.MySaveProgressEventHandler; - - // ルートのディレクトリを作るか作らないか。 - string rootPathInArchive = ""; - - if (!this.cbxRootDir.Checked) - { - rootPathInArchive = temp[temp.Length - 1]; - } - - // 圧縮（１）デリゲートでフィルタ - z.CreateZipFromFolder( - this.txtFile.Text, this.txtFolder.Text, - scd, exts, rootPathInArchive, // ここを空文字列にするとルートフォルダ無しになる。 - Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), - (EncryptionAlgorithm)this.cmbCyp.SelectedItem, this.txtPass.Text, - (CompressionLevel)this.cmbCmpLv.SelectedItem -#if NETCOREAPP - ); -#else - , selfEx); -#endif - - - //// 圧縮（２）：selectionCriteriaStringでフィルタ - //string selectionCriteriaString = ""; - //if (exts != null) - //{ - // foreach (string ext in exts) - // { - // if (selectionCriteriaString == "") - // { - // selectionCriteriaString = "name != *." + ext; - // } - // else - // { - // selectionCriteriaString += " and name != *." + ext; - // } - // } - //} - - //z.CreateZipFromFolder( - // this.txtFile.Text, this.txtFolder.Text, - // selectionCriteriaString, - // temp[temp.Length - 1], - // Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), - // (EncryptionAlgorithm)this.cmbCyp.SelectedItem, this.txtPass.Text, - // (CompressionLevel)this.cmbCmpLv.SelectedItem, selfEx); - - //MessageBox.Show(z.StatusMSG,"サマリ", - // MessageBoxButtons.OK, MessageBoxIcon.Information); - - CustMsgBox custMsgBox = new CustMsgBox(ResourceMgr.GetString("Error0002"), z.StatusMSG, SystemIcons.Information); - custMsgBox.ShowDialog(); - } - catch (Exception ex) - { - //MessageBox.Show(ex.Message, "エラーが発生しました。", MessageBoxButtons.OK, MessageBoxIcon.Error); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - MessageBox.Show(ex.Message, ResourceMgr.GetString("E0001"), MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - /// 解凍処理 - private void btnDecomp_Click(object sender, EventArgs e) - { - try - { - // チェック処理 - this.CheckComp_DeComp(); - - // 解凍部品 - UnZipper uz = new UnZipper(); - - // 選択基準 - string[] exts = null; - Zipper.SelectionDelegate scd = null; - - if (this.txtExt.Enabled) - { - exts = this.txtExt.Text.Split(','); - scd = Program.SelectionCriteriaDlgt2; - } - - // 解凍時、上書き制御 - uz.ExtractProgress = Program.MyExtractProgressEventHandler; - - // 解凍（１）デリゲートでフィルタ - uz.ExtractFileFromZip( - this.txtFile.Text, this.txtFolder.Text, scd, exts, - (ExtractExistingFileAction)this.cmbEEFA.SelectedItem, - Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), - this.txtPass.Text); - - //// 解凍（２）：selectionCriteriaStringでフィルタ - //string selectionCriteriaString = ""; - //if (exts != null) - //{ - // foreach (string ext in exts) - // { - // if (selectionCriteriaString == "") - // { - // selectionCriteriaString = "name != *." + ext; - // } - // else - // { - // selectionCriteriaString += " and name != *." + ext; - // } - // } - //} - - //uz.ExtractFileFromZip( - // this.txtFile.Text, - // this.txtFolder.Text, - // selectionCriteriaString, - // (ExtractExistingFileAction)this.cmbEEFA.SelectedItem, - // Encoding.GetEncoding((string)this.cmbEnc.SelectedItem), - // this.txtPass.Text); - - //MessageBox.Show(uz.StatusMSG, "サマリ", - // MessageBoxButtons.OK, MessageBoxIcon.Information); - - //CustMsgBox custMsgBox = new CustMsgBox("サマリ（解凍）", uz.StatusMSG, SystemIcons.Information); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - CustMsgBox custMsgBox = new CustMsgBox(ResourceMgr.GetString("Error0003"), uz.StatusMSG, SystemIcons.Information); - custMsgBox.ShowDialog(); - } - catch(Exception ex) - { - //MessageBox.Show(ex.Message, "エラーが発生しました。", MessageBoxButtons.OK, MessageBoxIcon.Error); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - MessageBox.Show(ex.Message, ResourceMgr.GetString("E0001"), MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - /// チェック処理 - private void CheckComp_DeComp() - { - if (string.IsNullOrEmpty(this.txtFolder.Text)) - { - //throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), "フォルダ パス")); - //For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call - throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), GetMessage.GetMessageDescription("M0001"))); - } - - if(string.IsNullOrEmpty(this.txtFile.Text)) - { - //throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), "ファイル パス")); - //For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call - throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), GetMessage.GetMessageDescription("M0002"))); - } - } - - #region いろいろ選択 - - /// フォルダ選択 - private void btnSelectFolder_Click(object sender, EventArgs e) - { - this.folderBrowserDialog1.ShowDialog(); - this.txtFolder.Text = folderBrowserDialog1.SelectedPath; - } - - /// ファイル選択 - private void btnSelectSaveFile_Click(object sender, EventArgs e) - { - //if (this.tabZipUnZip.SelectedTab.Text == "圧縮") - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - if (this.tabZipUnZip.SelectedTab.Text == ResourceMgr.GetString("T0001")) - { - // 保存 - this.saveFileDialog1.DefaultExt = ""; - this.saveFileDialog1.ShowDialog(); - this.txtFile.Text = saveFileDialog1.FileName; - } - else - { - // 開く - //this.openFileDialog1.Filter = "ZIPファイル|*.zip"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - this.openFileDialog1.Filter = ResourceMgr.GetString("EXT0001"); - - this.openFileDialog1.ShowDialog(); - this.txtFile.Text = openFileDialog1.FileName; - } - } - - /// 拡張子選択 - private void cbxExt_CheckedChanged(object sender, EventArgs e) - { - if (((CheckBox)sender).Checked == true) - { - this.txtExt.Enabled = true; - } - else - { - this.txtExt.Enabled = false; - } - } - - /// 形式選択 - private void cmbFormat_CheckedChanged(object sender, EventArgs e) - { - if (((CheckBox)sender).Checked == true) - { - this.cmbFormat.Enabled = true; - } - else - { - this.cmbFormat.Enabled = false; - } - } - - #endregion - - #endregion - - #region マニュフェスト - - /// ZIPを追加する - private void btnAddZIPFile_Click(object sender, EventArgs e) - { - this.openFilesDialog1.Reset(); // ごみを消去 - this.openFilesDialog1.ShowDialog(); - string[] zipFiles = this.openFilesDialog1.FileNames; - - foreach (string zipFile in zipFiles) - { - // 追加済みフラグ - bool isAdded = false; - - if (zipFile.Substring(zipFile.Length - 4, 4).ToLower() == ".zip") - { - foreach (string temp in this.lbxZIPFiles.Items) - { - // 追加済みフラグ - if (temp == zipFile) - { - isAdded = true; - } - } - - // 追加済みで無い場合。 - if (!isAdded) - { - this.lbxZIPFiles.Items.Add(zipFile); - } - } - } - } - - /// ZIPを削除する - private void btnRemoveZIPFile_Click(object sender, EventArgs e) - { - this.lbxZIPFiles.Items.Remove( - this.lbxZIPFiles.SelectedItem); - } - - /// マニュフェストファイルを生成 - private void btnCreateManifesto_Click(object sender, EventArgs e) - { - try - { - if (this.lbxZIPFiles.Items.Count ==0) - { - //throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), "ZIPファイル")); - //For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call - throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), GetMessage.GetMessageDescription("M0003"))); - } - - if (string.IsNullOrEmpty(this.txtInsDir.Text)) - { - //throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), "インストール ディレクトリ")); - //For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call - throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), GetMessage.GetMessageDescription("M0004"))); - } - - if (string.IsNullOrEmpty(this.txtExeName.Text)) - { - //throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), "EXE名（パス）")); - //For internationalization, Replaced all the Japanese language exception messages with GetMessage.GetMessageDescription() method call - throw new Exception(string.Format(GetMessage.GetMessageDescription("E0007"), GetMessage.GetMessageDescription("M0005"))); - } - - // 保存 - this.saveFileDialog1.Reset(); // ごみを消去 - this.saveFileDialog1.DefaultExt = "mft"; - this.saveFileDialog1.ShowDialog(); - - using (StreamWriter sw = new StreamWriter( - saveFileDialog1.FileName, false, Encoding.GetEncoding(CustomEncode.UTF_8))) - { - sw.WriteLine("ins " + this.txtInsDir.Text); - sw.WriteLine("exe " + this.txtExeName.Text); - - foreach (string zipFile in this.lbxZIPFiles.Items) - { - string[] temp = zipFile.Split('\\'); - - sw.WriteLine("zip " + temp[temp.Length - 1]); - sw.WriteLine("md5 " + Program.GetMD5Hash(zipFile)); - } - } - } - catch (Exception ex) - { - //MessageBox.Show(ex.Message, "エラーが発生しました。", MessageBoxButtons.OK, MessageBoxIcon.Error); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - MessageBox.Show(ex.Message, ResourceMgr.GetString("E0001"), MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - - #endregion - - #region 更新チェック＆インストール - - /// 更新チェック＆インストール - private void btnCheckUpdateAndInstall_Click(object sender, EventArgs e) - { - // エントリを生成 - Entry entry = new Entry(); - - entry.WWWURL = txtURL.Text; - entry.WWWUID = txtUID.Text; - entry.WWWPWD = txtPWD.Text; - entry.WWWDomain = txtDomain.Text; - //--- - entry.ProxyURL = txtProxyURL.Text; - entry.ProxyUID = txtProxyUID.Text; - entry.ProxyPWD = txtProxyPWD.Text; - entry.ProxyDomain = txtProxyDomain.Text; - - // エントリを保存 - Program.SaveCurrent(entry); - - // 履歴をロード - this.LoadHistories(); - - #region 更新処理の実行 - - // 非同期呼び出し - Program.Af = new MyBaseAsyncFunc(this.panel1); - - // 非同期処理本体デレゲード - Program.Af.AsyncFunc = new BaseAsyncFunc.AsyncFuncDelegate(Program.ExecUpdate); - - // 進捗報告・無名関数デレゲード - Program.Af.ChangeProgress = delegate(object param) - { - this.Status = ((ChangeProgressParameter)param).Status; - this.Refresh(); - }; - - // 結果設定・無名関数デレゲード - Program.Af.SetResult = delegate(object retVal) - { - if (retVal is MyException) - { - // 戻し - Program.Recover(); - - // メッセージ表示時 - MyException my_ex = (MyException)retVal; - string message = my_ex.Message; - - // ログ出力用のフィールドがあるか？ないか？ - if (string.IsNullOrEmpty(my_ex.ToLog)) - { - Program.OutPutMessage(message, LogLevel.InfoLog); - } - else - { - Program.OutPutMessage(message + "\r\n" + my_ex.ToLog, LogLevel.InfoLog); - } - - //MessageBox.Show(message, "メッセージ", MessageBoxButtons.OK, MessageBoxIcon.Information); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - MessageBox.Show(message, ResourceMgr.GetString("M0001"), MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else if (retVal is Exception) - { - // 戻し - Program.Recover(); - - // 例外発生時 - string message = ""; - Exception ex = (Exception)retVal; - - //message += "＜メッセージ＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0002") + "\r\n"; - message += ex.Message; - message += "\r\n"; - - message += "\r\n"; - //message += "＜スタック トレース＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0003") + "\r\n"; - message += ex.StackTrace; - message += "\r\n"; - - if (ex.InnerException != null) - { - message += "\r\n"; - //message += "＜内部例外＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0004") + "\r\n"; - message += ex.InnerException.ToString(); - message += "\r\n"; - } - - Program.OutPutMessage(message, LogLevel.ErrorLog); - - //CustMsgBox custMsgBox = new CustMsgBox("エラー", message, SystemIcons.Error); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - CustMsgBox custMsgBox = new CustMsgBox(ResourceMgr.GetString("Error0001"), string.Format(message), SystemIcons.Error); - custMsgBox.ShowDialog(); - } - else - { - // 正常終了 - - // 履歴を保存 - Program.SaveHistories(); - - // エントリ・履歴の復元する。 - this.LoadBins(); - } - - // テンポラリの削除 - File.Delete(Program.OrgCurrentDirectory + Program.TempMftFileName); - - // GCでZIPが解放される可能性 - //GC.Collect(); - Program.system_gc_collecting(); - try - { - File.Delete(Program.OrgCurrentDirectory + Program.TempZipFileName); - } - catch (Exception ex) - { - // 例外を潰してログに出力 - //Program.OutPutMessage(Program.TempZipFileName + "削除例外：" + ex.ToString(), LogLevel.ErrorLog); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Program.OutPutMessage(Program.TempZipFileName + ResourceMgr.GetString("E0002") + ex.ToString(), LogLevel.ErrorLog); - } - }; - - // 非同期処理を開始させる。 - Program.Af.Parameter = entry; - - if (Program.Af.Start()) - { - //this.ｘｘｘ(string.Format( - // "キューイングされました、現在のスレッド数:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - else - { - //this.ｘｘｘ(string.Format( - // "非同期スレッドが最大数に達しています。:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - - #endregion - } - - #endregion - - /// 履歴を消す - private void btnDelHistory_Click(object sender, EventArgs e) - { - // 削除対象エントリ - Entry entry = null; - - // 履歴を消す - foreach (Entry temp in Program.Histories) - { - // 履歴に一致 - if (this.cmbHistorys.Text == temp.WWWURL) - { - entry = temp; - } - } - - if (entry != null) - { - // 履歴を更新 - Program.Histories.Remove(entry); - // 履歴を保存 - Program.SaveHistories(); - - // 画面を変更 - - // コンボボックス - this.LoadHistories(); - - // テキストボックス - this.txtURL.Text = ""; - this.txtUID.Text = ""; - this.txtPWD.Text = ""; - this.txtDomain.Text = ""; - - this.txtProxyURL.Text = ""; - this.txtProxyUID.Text = ""; - this.txtProxyPWD.Text = ""; - this.txtProxyDomain.Text = ""; - } - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx deleted file mode 100644 index 1d52a61fe..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.ja-JP.resx +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ステータス - - - ZIPファイル|*.zip - - - 削除 - - - - 59, 13 - - - 設定ロード - - - 更新をチェックしてインストール - - - 42, 13 - - - ドメイン - - - 54, 13 - - - パスワード - - - 48, 13 - - - ユーザID - - - WWWサーバ - - - 42, 13 - - - ドメイン - - - 54, 13 - - - パスワード - - - 48, 13 - - - ユーザID - - - Proxyサーバ - - - HTTPでデプロイ - - - 42, 13 - - - フォルダ - - - 53, 13 - - - ファイル名 - - - 選択 - - - 除外拡張子 - - - 選択 - - - 404, 11 - - - チェック有り：指定ZIPファイル名をルートZIP内フォルダに含めない（ルート フォルダからの圧縮）。 - - - 390, 15 - - - チェック無し：指定ZIPファイル名をルートZIP内フォルダに含める（個別のフォルダ圧縮）。 - - - 圧縮 - - - 31, 13 - - - 形式 - - - 43, 13 - - - 暗号化 - - - 43, 13 - - - 圧縮Lv - - - 圧縮 - - - 解凍 - - - 64, 13 - - - 上書き動作 - - - 解凍（テスト） - - - 38, 13 - - - 解パス - - - Zipパッケージを作成 - - - 374, 13 - - - EXE名（パス）はカンマ区切りで指定可能で、先頭のEXEが起動の対象となる。 - - - 383, 13 - - - 起動するEXEのパスは、[インストール ディレクトリ] + [EXE名（パス）]で構成される。 - - - 413, 13 - - - インストール ディレクトリには環境変数を指定可能：%USERPROFILE%\XXX\YYY\ZZZ - - - 114, 13 - - - インストール ディレクトリ - - - 71, 13 - - - EXE名（パス） - - - マニュフェストファイルを作成する - - - 削除する - - - 追加する - - - 配置マニュフェストを作成 - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx deleted file mode 100644 index 1e7a71f84..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form1.resx +++ /dev/null @@ -1,1922 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 11 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Status - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbxWWW - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageZip - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageManifesto - - - 17 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - lblPWD - - - lblProxyUID - - - tabPageManifesto - - - - 292, 20 - - - 4, 22 - - - btnRemoveZIPFile - - - 15, 16 - - - 4, 22 - - - 1 - - - 2 - - - True - - - btnSelectSaveFile - - - 18 - - - 0 - - - 7 - - - 87, 72 - - - 6 - - - tabPageZip - - - 0 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - gbxProxy - - - Thawing - - - Password - - - txtPass - - - 4 - - - True - - - 70, 13 - - - 331, 20 - - - 19, 122 - - - tabPageDeployWithHTTP - - - 9, 133 - - - 69, 27 - - - 11 - - - tabPageZipPackage - - - False - - - cbxRootDir - - - 19, 230 - - - 6, 148 - - - 89, 25 - - - gbxProxy - - - tabPageZip - - - Installation directory - - - lblFolder - - - True - - - 43, 13 - - - 19, 207 - - - 87, 13 - - - 5 - - - 19, 291 - - - 106, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 16 - - - gbxProxy - - - 430, 193 - - - txtProxyUID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - Exclusion extension - - - 7 - - - 332, 35 - - - 10 - - - MS UI Gothic, 8.25pt - - - 6 - - - 415, 25 - - - 93, 10 - - - User ID - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5, 404 - - - 18, 77 - - - 18 - - - DeployZipPackWithHTTP - - - 1 - - - * - - - 4, 22 - - - $this - - - 0 - - - cmbEnc - - - 1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 8 - - - txtExt - - - 5 - - - 43, 13 - - - 87, 101 - - - 9 - - - 3 - - - - 3, 3, 3, 3 - - - saveFileDialog1 - - - tabPageDeployWithHTTP - - - tabPageUnZip - - - 424, 25 - - - True - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - * - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 331, 20 - - - True - - - gbxWWW - - - tabDeployZipPac - - - 94, 64 - - - 6, 321 - - - 19, 67 - - - 9 - - - 12 - - - 3 - - - 15, 142 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Selection - - - tabPageZipPackage - - - 29, 13 - - - tabPageDeployWithHTTP - - - 540, 15 - - - Load settings - - - gbxProxy - - - 1 - - - 337, 21 - - - 5 - - - tabPageZipPackage - - - Compression - - - txtUID - - - 6, 13 - - - 0 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 245, 21 - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - openFilesDialog1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - Deployed in HTTP - - - ZIP file |. * Zip - - - * - - - I want to create a manifest file - - - True - - - lblPass - - - tabPageManifesto - - - lblUID - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageZipPackage - - - 43, 13 - - - 2 - - - 3 - - - 19, 277 - - - 53, 13 - - - 2 - - - gbxWWW - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - EXE name (path) - - - Compression Lv - - - 2, 10 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 396, 66 - - - lblFile - - - True - - - 3, 3, 3, 3 - - - True - - - 19, 48 - - - 6, 35 - - - 0 - - - 19, 75 - - - 1 - - - 4 - - - 2, 66 - - - 2 - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - File name - - - gbxWWW - - - False - - - 4 - - - 19, 94 - - - tabPageManifesto - - - 331, 20 - - - 7 - - - 8 - - - 21 - - - lblStatus - - - * - - - 4 - - - 8 - - - 3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - lblHistorys - - - 12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 86, 25 - - - (Folder compression of individual) to be included in the root folder in the ZIP specified ZIP file name: unchecked. - - - euc-jp - - - True - - - 58, 28 - - - 2 - - - 5 - - - 422, 167 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 43, 13 - - - 442, 353 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - cbxExt - - - 2 - - - panel1 - - - tabPageZipPackage - - - NoControl - - - 18, 50 - - - 100, 13 - - - txtInsDir - - - lblEEFA - - - 5 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageZipPackage - - - btnSelectFolder - - - 13 - - - 25, 114 - - - 2 - - - gbxProxy - - - 7 - - - 69, 13 - - - tabPageZipPackage - - - cmbHistorys - - - 331, 20 - - - 1 - - - True - - - User ID - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - To create a deployment manifest - - - 44, 13 - - - Selection - - - tabZipUnZip - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - 8 - - - cmbFormat - - - 87, 74 - - - % USERPROFILE% \ XXX \ YYY \ ZZZ: you can specify the environment variable to the installation directory - - - tabPageManifesto - - - 331, 20 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnDelHistory - - - gbxWWW - - - Overwrite operation - - - False - - - True - - - 52, 13 - - - Format - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - 5 - - - WWW server - - - txtDomain - - - 13 - - - lblEnc - - - btnCompress - - - 15, 171 - - - 87, 99 - - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - - - tabPageManifesto - - - tabPageZip - - - lblProxyPWD - - - System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - label2 - - - Domain - - - 39, 13 - - - tabPageZip - - - True - - - Domain - - - 29, 13 - - - 0 - - - tabPageUnZip - - - 19, 104 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 19 - - - 4, 22 - - - lblFormat - - - 19, 40 - - - txtFolder - - - tabPageZip - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 19 - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4, 22 - - - tabPageDeployWithHTTP - - - tabDeployZipPac - - - 15, 14 - - - True - - - True - - - tabPageManifesto - - - 5 - - - 4 - - - Solution path - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 306, 20 - - - lblExeName - - - 19, 102 - - - 11 - - - True - - - lblRootDirCheck - - - Encryption - - - 94, 119 - - - 6 - - - 8 - - - lblProxyURL - - - 12 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 94, 10 - - - 8 - - - 6, 174 - - - tabPageZipPackage - - - tabPageZipPackage - - - tabPageZipPackage - - - lblExt - - - 3 - - - 19, 13 - - - 3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 87, 47 - - - tabPageZip - - - 19, 23 - - - label1 - - - 1 - - - The path of the EXE to start is made in the installation directory] + [(path) EXE name. - - - 450, 379 - - - 2 - - - 9, 133 - - - 53, 63 - - - 138, 226 - - - 20 - - - 6 - - - 18 - - - 8 - - - 462, 392 - - - 99, 13 - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 89, 25 - - - * - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 406, 67 - - - 11 - - - 19 - - - 19, 249 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - btnAddZIPFile - - - tabPageManifesto - - - shift_jis - - - 424, 133 - - - 420, 28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Add - - - Folder - - - 312, 21 - - - True - - - 450, 16 - - - tabPageManifesto - - - tabPageZip - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbxProxy - - - 9 - - - cmbCmpLv - - - System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - gbxWWW - - - 331, 20 - - - tabPageManifesto - - - 57, 13 - - - 3 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Create a Zip package - - - lblProxyDomain - - - 232, 20 - - - tabPageZipPackage - - - txtURL - - - True - - - 2 - - - 23 - - - 327, 20 - - - gbxWWW - - - 4 - - - 402, 25 - - - 0 - - - 23 - - - 3 - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 10 - - - 10 - - - 19, 21 - - - 138, 204 - - - 94, 37 - - - Delete - - - 5 - - - 6, 7 - - - 380, 25 - - - 10 - - - tabPageDeployWithHTTP - - - Remove - - - 403, 13 - - - True - - - 15, 14 - - - False - - - 327, 21 - - - 600, 11 - - - URL - - - Install it check for updates - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 4 - - - tabPageZipPackage - - - 358, 21 - - - 24, 13 - - - 3 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 87, 17 - - - 415, 25 - - - utf-8 - - - 7 - - - panel1 - - - 0 - - - 1 - - - 0 - - - 87, 20 - - - lblCyp - - - 61, 7 - - - 87, 44 - - - True - - - 15 - - - 3, 38 - - - 16 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabPageUnZip - - - btnCheckUpdateAndInstall - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - EXE name (path) to be specified in a comma-separated, EXE the first is subject to activation. - - - tabPageZipPackage - - - gbxProxy - - - 7 - - - $this - - - txtProxyDomain - - - 6 - - - gbxProxy - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 7 - - - 53, 13 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 15, 319 - - - lblURL - - - txtExeName - - - 424, 133 - - - 1 - - - openFileDialog1 - - - 415, 121 - - - gbxProxy - - - tabPageZip - - - 0 - - - 10 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - tabDeployZipPac - - - 1 - - - 9 - - - cbxFormat - - - 9 - - - tabPageZip - - - tabPageManifesto - - - Thawing (test) - - - tabPageZipPackage - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 344, 8 - - - txtProxyURL - - - 358, 21 - - - 36, 13 - - - 2 - - - lblCmpLv - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 14 - - - 6 - - - 8, 91 - - - 4 - - - cmbCyp - - - 464, 427 - - - 9 - - - (Compression from the root folder) that you do not want to include in the root folder in the ZIP ZIP file name specified: Checked. - - - 8 - - - Proxy server - - - folderBrowserDialog1 - - - 14 - - - 7 - - - 442, 353 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 331, 20 - - - lblDomain - - - txtFile - - - 7 - - - 292, 20 - - - gbxWWW - - - txtPWD - - - tabZipUnZip - - - 94, 91 - - - tabPageDeployWithHTTP - - - tabPageUnZip - - - gbxWWW - - - 9 - - - MS UI Gothic, 8.25pt - - - cmbEEFA - - - tabZipUnZip - - - label3 - - - btnDecomp - - - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Encode - - - 3, 3, 3, 3 - - - URL - - - 1, 2 - - - 415, 25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Form1 - - - Compression - - - tabPageManifesto - - - 331, 20 - - - 3, 3, 3, 3 - - - 1 - - - 0 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 232, 20 - - - 5 - - - 61, 35 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - lbxZIPFiles - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 442, 353 - - - tabDeployZipPac - - - 0 - - - btnCreateManifesto - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 422, 167 - - - tabPageZipPackage - - - Password - - - 4 - - - 0 - - - 6 - - - tabPageZip - - - lblInsDir - - - tabPageDeployWithHTTP - - - 5 - - - 7 - - - 332, 8 - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 6 - - - txtProxyPWD - - - 0 - - - 433, 26 - - - True - - - 178, 17 - - - 441, 17 - - - 309, 17 - - - 17, 17 - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs deleted file mode 100644 index 1f6138575..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.Designer.cs +++ /dev/null @@ -1,77 +0,0 @@ -namespace DeployZipPackWithHTTP -{ - partial class Form2 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form2)); - this.panel1 = new System.Windows.Forms.Panel(); - this.lblStatus = new System.Windows.Forms.Label(); - this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.panel1.SuspendLayout(); - this.SuspendLayout(); - // - // panel1 - // - this.panel1.Controls.Add(this.lblStatus); - this.panel1.Controls.Add(this.progressBar1); - resources.ApplyResources(this.panel1, "panel1"); - this.panel1.Name = "panel1"; - // - // lblStatus - // - resources.ApplyResources(this.lblStatus, "lblStatus"); - this.lblStatus.Name = "lblStatus"; - // - // progressBar1 - // - resources.ApplyResources(this.progressBar1, "progressBar1"); - this.progressBar1.Name = "progressBar1"; - // - // Form2 - // - resources.ApplyResources(this, "$this"); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.panel1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "Form2"; - this.Load += new System.EventHandler(this.Form2_Load); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label lblStatus; - private System.Windows.Forms.ProgressBar progressBar1; - } -} \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs deleted file mode 100644 index 5b876640e..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.cs +++ /dev/null @@ -1,399 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：Form2 -//* クラス日本語名 ：サブ画面（CUIの進捗報告画面） -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/06/17 西野 大介 新規作成 -//* 2011/07/01 西野 大介 最後に進捗が100％になるように変更 -//* 2011/07/01 西野 大介 コマンドライン引数のハッシュキーを全て大文字化 -//* 2011/08/01 西野 大介 タイトルをメッセージ定義から取得するように変更。 -//* 2011/08/01 西野 大介 最大化、最小化、閉じるボタンを無効にした。 -//* 2011/08/01 西野 大介 最後、自身を閉じる（非同期待機時間を設定可能に） -//* 2011/08/01 西野 大介 /QUIET クワイエット モードを追加した。 -//* 2011/08/01 西野 大介 進捗値の進み具合を調整した。 -//* 2011/08/01 西野 大介 ステータスの書き込み（終了時） -//* 2011/08/30 西野 大介 異常終了時に退避ディレクトリからリカバリ。 -//* 2011/08/30 西野 大介 テンポラリの削除処理を追加した（例外処理を追加）。 -//* 2011/08/30 西野 大介 Exceptionではメッセージ表示しないよう修正した。 -//* 2011/09/05 西野 大介 GCするコードを追加→修正（解凍ZIPがCloseされないため） -//* 2011/09/08 西野 大介 リカバリ処理のログ出力位置の変更 -//* （リカバリしない時ログを出力しないよう変更）。 -//* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 -//* 2014/04/26 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call -//* 2020/08/03 西野 大介 NETCOREAPP対応 -//********************************************************************************** - -using System; -using System.IO; -using System.Collections.Generic; -using System.Threading; -using System.Security.Permissions; -using System.Resources; -using System.Windows.Forms; - -using Touryo.Infrastructure.Business.RichClient.Asynchronous; -using Touryo.Infrastructure.Framework.RichClient.Asynchronous; -using Touryo.Infrastructure.Framework.Util; -using Touryo.Infrastructure.Public.Util; - -namespace DeployZipPackWithHTTP -{ - public partial class Form2 : Form - { - /// 値 - private List ValsLst; - /// コマンド・値 - private Dictionary ArgsDic; - - /// ステータス表示用 - public string Status - { - set - { - this.lblStatus.Text = value; - } - get - { - return this.lblStatus.Text; - } - } - - /// - /// Getting ResourceManager instance from Resources to apply internationalization - /// - private ResourceManager ResourceMgr - { - get - { - return Resources.Resource.ResourceManager; - } - } - - /// コンストラクタ - /// 値 - /// コマンド・値 - public Form2(List valsLst, Dictionary argsDic) - { - InitializeComponent(); - - this.ValsLst = valsLst; - this.ArgsDic = argsDic; - - // タイトルの設定 - string temp - = GetMessage.GetMessageDescription("I0000"); - - if (string.IsNullOrEmpty(temp)) - { - // IsNullOrEmptyの場合はデフォルト - } - else - { - // タイトルを設定した。 - this.Text = temp; - } - } - - /// Form2_Load - private void Form2_Load(object sender, EventArgs e) - { - // コマンドの確認 - Program.ConfirmCommand(this.ValsLst, this.ArgsDic); - - // エントリを生成 - Entry entry = new Entry(); - - // コマンドラインから各値を取得する。 - entry.WWWURL = Program.NullToEmptyString(this.ArgsDic, "/WWWURL"); - entry.WWWUID = Program.NullToEmptyString(this.ArgsDic, "/WWWUID"); - entry.WWWPWD = Program.NullToEmptyString(this.ArgsDic, "/WWWPWD"); - entry.WWWDomain = Program.NullToEmptyString(this.ArgsDic, "/WWWDOMAIN"); - //--- - entry.ProxyURL = Program.NullToEmptyString(this.ArgsDic, "/PROXYURL"); - entry.ProxyUID = Program.NullToEmptyString(this.ArgsDic, "/PROXYUID"); - entry.ProxyPWD = Program.NullToEmptyString(this.ArgsDic, "/PROXYPWD"); - entry.ProxyDomain = Program.NullToEmptyString(this.ArgsDic, "/PROXYDOMAIN"); - - //// エントリを保存 - //Program.SaveCurrent(entry); - - // 履歴をロード - Program.LoadHistories(); - - #region 更新処理の実行 - - // 非同期呼び出し - Program.Af = new MyBaseAsyncFunc(this.panel1); - - // 非同期処理本体デレゲード - Program.Af.AsyncFunc = new BaseAsyncFunc.AsyncFuncDelegate(Program.ExecUpdate); - - // 進捗報告・無名関数デレゲード - Program.Af.ChangeProgress = delegate(object param) - { - ChangeProgressParameter cpp = (ChangeProgressParameter)param; - - this.Status = cpp.Status; - - // 知的でないプログレス的なもの - int progressVal = this.progressBar1.Value + cpp.ProgressVal; - if (progressVal < this.progressBar1.Maximum - 5) - { - // 95％を超えない場合、変更する。 - this.progressBar1.Value = progressVal; - } - else - { - // 95％を超える場合、変更しない。 - } - - this.Refresh(); - }; - - // 結果設定・無名関数デレゲード - Program.Af.SetResult = delegate(object retVal) - { - if (retVal is MyException) - { - // 戻し - Program.Recover(); - - // メッセージ表示時 - MyException my_ex = (MyException)retVal; - string message = my_ex.Message; - - // ログ出力用のフィールドがあるか？ないか？ - if (string.IsNullOrEmpty(my_ex.ToLog)) - { - Program.OutPutMessage(message, LogLevel.InfoLog); - } - else - { - Program.OutPutMessage(message + "\r\n" + my_ex.ToLog, LogLevel.InfoLog); - } - - // ステータスを書き込む - //this.Status = "正常終了"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - this.Status = ResourceMgr.GetString("S0001"); - if (ArgsDic.ContainsKey("/QUIET")) - { - // メッセージ表示しない - } - else - { - // メッセージ表示する - //MessageBox.Show(message, "メッセージ", MessageBoxButtons.OK, MessageBoxIcon.Information); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - MessageBox.Show(message, ResourceMgr.GetString("M0001"), MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } - else if (retVal is Exception) - { - // 戻し - Program.Recover(); - - // 例外発生時 - string message = ""; - Exception ex = (Exception)retVal; - - //message += "＜メッセージ＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0002") + "\r\n"; - message += ex.Message; - message += "\r\n"; - - message += "\r\n"; - //message += "＜スタック トレース＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0003") + "\r\n"; - message += ex.StackTrace; - message += "\r\n"; - - if (ex.InnerException != null) - { - message += "\r\n"; - //message += "＜内部例外＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0004") + "\r\n"; - message += ex.InnerException.ToString(); - message += "\r\n"; - } - - Program.OutPutMessage(message, LogLevel.ErrorLog); - - // ステータスを書き込む - //this.Status = "異常終了"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - this.Status = ResourceMgr.GetString("S0002"); - - // Exceptionではメッセージ表示しない。 - - //if (ArgsDic.ContainsKey("/QUIET")) - //{ - // // メッセージ表示しない - //} - //else - //{ - // // メッセージ表示する - // CustMsgBox custMsgBox = new CustMsgBox( - // "エラー", message, SystemIcons.Error); - - // custMsgBox.ShowDialog(); - //} - } - else - { - // 正常終了 - - // ステータスを書き込む - //this.Status = "正常終了"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - this.Status = ResourceMgr.GetString("S0001"); - - // 履歴を保存 - Program.SaveHistories(); - } - - // 進捗を100％に変更 - this.progressBar1.Value = 100; - - // テンポラリの削除 - File.Delete(Program.OrgCurrentDirectory + Program.TempMftFileName); - - // GCでZIPが解放される可能性 - //GC.Collect(); - Program.system_gc_collecting(); - try - { - File.Delete(Program.OrgCurrentDirectory + Program.TempZipFileName); - } - catch(Exception ex) - { - // 例外を潰してログに出力 - //Program.OutPutMessage(Program.TempZipFileName + "削除例外：" + ex.ToString(), LogLevel.ErrorLog); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Program.OutPutMessage(Program.TempZipFileName + ResourceMgr.GetString("E0002") + ex.ToString(), LogLevel.ErrorLog); - } - - // 終了処理 - this.BeginInvoke(new MethodInvoker(FinalBeginInvoke)); - }; - - // 非同期処理を開始させる。 - Program.Af.Parameter = entry; - - if (Program.Af.Start()) - { - //this.ｘｘｘ(string.Format( - // "キューイングされました、現在のスレッド数:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - else - { - //this.ｘｘｘ(string.Format( - // "非同期スレッドが最大数に達しています。:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - - #endregion - } - - /// 終了処理（３秒待って終了） - private void FinalBeginInvoke() - { - // 非同期呼び出し - Program.Af = new MyBaseAsyncFunc(this.panel1); - - // 非同期処理本体デレゲード - Program.Af.AsyncFunc = delegate(object o) - { - // 指定時間スリープ - string temp = GetConfigParameter.GetConfigValue("PDWSleepSec"); - - if (!string.IsNullOrEmpty(temp)) - { - int sleepSec = 0; - if (int.TryParse(temp, out sleepSec)) - { - // 指定の時間スリープ - Thread.Sleep(sleepSec * 1000); - } - } - - return null; - }; - - // 進捗報告・無名関数デレゲード - Program.Af.ChangeProgress = null; - - // 結果設定・無名関数デレゲード - Program.Af.SetResult = delegate(object retVal) - { - // スリープの後、自身を閉じる。 - this.Close(); - }; - - // 非同期処理を開始させる。 - Program.Af.Parameter = null; - - if (Program.Af.Start()) - { - //this.ｘｘｘ(string.Format( - // "キューイングされました、現在のスレッド数:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - else - { - //this.ｘｘｘ(string.Format( - // "非同期スレッドが最大数に達しています。:{0}", - // BaseAsyncFunc.ThreadCount.ToString())); - } - } - - /// - /// 閉じるボタンの無効化 - /// http://dobon.net/vb/dotnet/form/disabledclosebutton.html - /// - /// Windowメッセージ - [SecurityPermission( - SecurityAction.LinkDemand, - Flags = SecurityPermissionFlag.UnmanagedCode)] - protected override void WndProc(ref Message m) - { - const int WM_SYSCOMMAND = 0x112; - const int SC_CLOSE = 0xF060; - - if (m.Msg == WM_SYSCOMMAND && m.WParam.ToInt32() == SC_CLOSE) - { - return; - } - - base.WndProc(ref m); - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx deleted file mode 100644 index 2da80c190..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.ja-JP.resx +++ /dev/null @@ -1,189 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 52, 13 - - - ステータス - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - - 更新確認進捗ダイアログ - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx deleted file mode 100644 index 0dd307fa4..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Form2.resx +++ /dev/null @@ -1,271 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - True - - - - 12, 51 - - - 37, 13 - - - 1 - - - Status - - - lblStatus - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 0 - - - 14, 15 - - - 241, 25 - - - 0 - - - progressBar1 - - - System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - panel1 - - - 1 - - - 12, 13 - - - 273, 77 - - - 0 - - - panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 0 - - - ja-JP - - - True - - - 6, 13 - - - 295, 103 - - - - AAABAAEAICAAAAEAGACoDAAAFgAAACgAAAAgAAAAQAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS1/TS1/QAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAACirOg7T847T86irOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukySMwIIsEIIsEy - SMypsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAACjreg6T84gOMcIIsEAG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEA - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAC4v+2psukxR8sIIsEAG78AG78AG78AG78AG78AG78AG78AG78IIsEx - R8upsum4v+0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACjreg6T84g - OMcIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEgOMc6T86jregAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAChq+cySMwIIsEAG78AG78AG78AG78AG78AG78AG78AG78A - G78AG78AG78AG78AG78AG78IIsEySMyhq+cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADL0fKy - uuwzScwIIsEAG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78AG78IIsEz - ScyyuuzL0fIAAAAAAAAAAAAAAAAAAAAAAAAAAADd4PZlddhIW9EwRssoP8koP8koP8kgOMcIIsEAG78A - G78AG78AG78AG78AG78AG78AG78IIsEgOMcoP8koP8koP8kwRstIW9FkddfU1+wAAAAAAAAAAAAAAAAA - AAD29/3u8PvS1/TGzPHCyPC/xu/Axu/ByPCxuesgOMcAG78AG78AG78AG78AG78AG78AG78AG78gOMex - uOa8wNq2utO2utO2utO2utO+wdXZ2t/f3+IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADDyvAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m8wNpkZGRKSkpKSkpKSkpKSkpKSkpeXl7B - wsMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADFy+8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKCgoKCgoKCgoKCgoKCgvLy9ZWVnKysoAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAADc3NzY2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgoKCgo - KCgoKCgoKCgoKChDQ0O/v7/U1NQAAAAAAAAAAAAAAAAAAAAAAAAAAADg4OB+fn5/f3/Dx+EoP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKCgvLy9DQ0NKSkpKSkpKSkpQUFBkZGR9fX3j4+MA - AAAAAAAAAAAAAAAAAADy8vLv7+/f39/Y2d/M0e0oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChDQ0O9vb3Ly8vKysrJycnLy8vPz8/Z2dnx8fH39/cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADEyu4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrLy8sAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAxu8oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrKysoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78A - G78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAC9xO4oP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC9xO4oP8kAG78A - G78AG78AG78AG78AG78AG78AG78oP8m2utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCyPAoP8kAG78AG78AG78AG78AG78AG78AG78AG78oP8m2 - utNKSkooKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADL0fJIW9EoP8koP8koP8koP8koP8koP8koP8koP8lIW9G+wdVKSkooKChKSkrHx8cAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADX2/XL0fLEyvDEyu7L0Oy8wNq2utO2 - utO2utO2utO+wdW7u8FDQ0MoKChKSkrHx8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADT1NpkZGRKSkpKSkpKSkpKSkpKSkpDQ0MvLy8oKChKSkrH - x8cAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AADS0tJKSkooKCgoKCgoKCgoKCgoKCgoKCgoKCgoKChKSkrLy8sAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADS0tJkZGRKSkpKSkpKSkpKSkpKSkpK - SkpKSkpKSkpkZGTS0tIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAADv7+/k5OTd3d3d3d3d3d3d3d3d3d3d3d3d3d3d3d3k5OTv7+8AAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAD/+f////D////AP///gB///wAP//wAA//4AAH/8AAA/8AAAD+AAAAfAAAAD/8A - AA//AAAH/AAAA/gAAAHwAAAA/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8A - AP//AAD///AA///wAP//8AD///AA/w== - - - - Update confirmation dialog progress - - - Form2 - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml deleted file mode 100644 index b443b2c36..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Log4DeployZipPackWithHTTP.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs deleted file mode 100644 index 457d282d1..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/LogLevel.cs +++ /dev/null @@ -1,44 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：LogLevel -//* クラス日本語名 ：ログレベル -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/xx/xx 西野 大介 新規作成 -//********************************************************************************** - -namespace DeployZipPackWithHTTP -{ - /// ログ・レベル - public enum LogLevel - { - DebugLog, - InfoLog, - WarnLog, - ErrorLog, - FatalLog - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml deleted file mode 100644 index 8722362de..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml deleted file mode 100644 index c20d2bcc8..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MSGDefinition_ja-JP.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs deleted file mode 100644 index a188d4be7..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/MyException.cs +++ /dev/null @@ -1,65 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：MyException -//* クラス日本語名 ：独自エクセプション -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/xx/xx 西野 大介 新規作成 -//* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 -//********************************************************************************** - -using System; - -namespace DeployZipPackWithHTTP -{ - /// 独自エクセプション - public class MyException : Exception - { - /// - /// ログ出力用 - /// - public string ToLog - { - private set; - get; - } - - /// コンストラクタ - /// メッセージ - public MyException(string message) - : base(message) { } - - /// コンストラクタ - /// メッセージ - /// ログ出力用 - public MyException(string message, string toLog) - : base(message) - { - // ログ出力用 - this.ToLog = toLog; - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs deleted file mode 100644 index b0f5adfda..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Program.cs +++ /dev/null @@ -1,2282 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：Program -//* クラス日本語名 ：エントリポイント -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 2011/04/18 西野 大介 新規作成 -//* 2011/07/01 西野 大介 SelectionCriteriaDlgt2のSplit文字を修正 -//* 2011/07/01 西野 大介 プロキシ設定、プロキシ認証のコードを修正 -//* 2011/07/01 西野 大介 強制モードで、インストール ディレクトリ -//* の削除処理の前に存在チェックを追加した。 -//* 2011/07/01 西野 大介 マニュフェストの起動exeのチェックエラー処理に -//* MyExceptionが使用されていたところを修正。 -//* 2011/07/01 西野 大介 ZIP部位もマニュフェスト ファイル不正例外を使用 -//* 2011/07/01 西野 大介 コマンドライン引数のハッシュキーを全て大文字化 -//* 2011/07/04 西野 大介 インストール ディレクトリ変更は例外に -//* 2011/07/04 西野 大介 アンインストール相当の処理コマンドを追加した。 -//* （ZIPを全て消去する方法ではEXE起動で例外になるので） -//* 2011/07/04 西野 大介 マニュフェスト ファイルのZIPのラインに何も無いとき、 -//* 処理が中断してしまう件を、例外を発生するよう修正 -//* 2011/08/01 西野 大介 /QUIET クワイエット モードを追加した。 -//* 2011/08/01 西野 大介 進捗値の進み具合を調整した。 -//* 2011/08/30 西野 大介 /NB モードを追加した。 -//* 2011/08/30 西野 大介 異常終了時に退避ディレクトリからリカバリ。 -//* 2011/08/30 西野 大介 テンポラリの削除処理を追加した（例外処理を追加）。 -//* 2011/09/01 西野 大介 オープン状態の場合、MyExceptionに振り替える。 -//* 2011/09/01 西野 大介 モジュール比較を大文字化してからに変更。 -//* 2011/09/01 西野 大介 マニュフェストファイルのfinally、Close処理を追加 -//* 2011/09/01 西野 大介 サーバに接続できない場合の例外処理を追加した。 -//* 接続できない場合でEXE起動する場合はログを出力する。 -//* 2011/09/05 西野 大介 GCするコードを追加→修正（解凍ZIPがCloseされないため） -//* 2011/09/05 西野 大介 起動プロセスのウィンドウを最前面にする処理を追加 -//* 2011/09/08 西野 大介 リカバリ処理のログ出力位置の変更 -//* （リカバリしない時ログを出力しないよう変更）。 -//* 2011/09/09 西野 大介 先頭部分でインストール ディレクトリの -//* 読み取り専用属性を消去する処理を追加。 -//* 2011/09/12 西野 大介 画面表示せず、ログ出力のみする例外処理方式を追加 -//* 2014/04/26 Sai Replaced all the Japanese language in both UI and code with ResorceManager.GetString() method call -//* 2014/05/12 Sai Removed and tags, added check while reading FxBusinessMessageCulture from app.config file -//* 2016/01/07 Sandeep Comment out the DefaultWebProxy property, because there is no use of this property in the component -//********************************************************************************** - -using System; -using System.IO; -using System.Net; -using System.Text; -using System.Collections.Generic; -using System.Threading; -using System.Diagnostics; -using System.Security.Cryptography; -using System.Runtime.InteropServices; -using System.Globalization; -using System.Resources; -using System.Windows.Forms; - -using Microsoft.VisualBasic.FileIO; -using Ionic.Zip; - -using Touryo.Infrastructure.Business.RichClient.Asynchronous; -using Touryo.Infrastructure.Framework.Util; -using Touryo.Infrastructure.Public.IO; -using Touryo.Infrastructure.Public.Log; -using Touryo.Infrastructure.Public.Str; -using Touryo.Infrastructure.Public.Util; - - -namespace DeployZipPackWithHTTP -{ - /// メインと共通 - static class Program - { - // DOBON.NET - // > ファイルをバイト型配列に読み込む、バイト型配列をファイルに書き込む - // http://dobon.net/vb/dotnet/file/filestream.html - // > 複数の配列をマージ（合併、連結、合体）する - // http://dobon.net/vb/dotnet/programing/arraymerge.html - // > WebRequest、WebResponseクラスを使ってファイルをダウンロードし保存する - // http://dobon.net/vb/dotnet/internet/webrequestsavefile.html - // > 二重起動を禁止する > Mutexを使用する方法 - // http://dobon.net/vb/dotnet/process/checkprevinstance.html - - /// 二重起動禁止Mutex - private static System.Threading.Mutex _mutex; - - #region フラグ - - /// FORCE実行かどうか - private static bool IsForce = false; - - /// 起動フラグ - private static bool IsBoot = true; - - #endregion - - #region 定数 - - /// カレントファイル - private static readonly string CurrentFileName = "\\current.bin"; - /// 履歴ファイル - private static readonly string HistoryFileName = "\\histories.bin"; - - /// マニュフェスト一時ファイル - public static readonly string TempMftFileName = "\\temp.mft"; - /// ZIP一時ファイル - public static readonly string TempZipFileName = "\\temp.zip"; - - #endregion - - #region 初回・初期化 - - /// カレントディレクトリ - public static string OrgCurrentDirectory = ""; - - #endregion - - #region 都度・初期化 - - /// 履歴情報 - public static List Histories = new List(); - - /// バックアップ（インストール）の有・無 - public static bool HaveBackup = false; - /// インストール ディレクトリを保存 - public static string InstallDirectory = ""; - /// バックアップ ディレクトリを保存 - public static string BackupDirectory = ""; - - /// - /// Getting ResourceManager instance from Resources to apply internationalization - /// - private static ResourceManager ResourceMgr - { - get - { - return Resources.Resource.ResourceManager; - } - } - - #endregion - - #region Win32 - - #region コンソール処理 - - /// - /// Allocates a new console for the calling process. - /// - [DllImport("kernel32.dll")] - private static extern Boolean AllocConsole(); - - /// - /// Attaches the calling process to the console of the specified process. - /// - /// - /// コンソール プロセスのID（-1の場合、親プロセス） - /// - [DllImport("kernel32.dll")] - public static extern Boolean AttachConsole(int dwProcessId); - - /// - /// Detaches the calling process from its console. - /// - [DllImport("kernel32.dll")] - private static extern Boolean FreeConsole(); - - #endregion - - #region ウィンドウ制御 - - static readonly IntPtr HWND_TOPMOST = new IntPtr(-1); - - // Z オーダーだけを目的に使う場合は - // SWP_NOMOVE と SWP_NOSIZE を指定することで - // (x, y), (cx, cy)を無視するようにする. - const uint SWP_NOSIZE = 0x0001; - const uint SWP_NOMOVE = 0x0002; - const uint TOPMOST_FLAGS = (SWP_NOSIZE | SWP_NOMOVE); - - /// - /// 子ウィンドウ、ポップアップウィンドウ、 - /// またはトップレベルウィンドウの - /// サイズ、位置、および Z オーダーを変更。 - /// これらのウィンドウは、その画面上 - /// での表示に従って順序が決められます。 - /// 最前面にあるウィンドウは最も高いランク - /// を与えられ、Z オーダーの先頭に置かれます。 - /// http://msdn.microsoft.com/ja-jp/library/cc411206.aspx - /// - /// ウィンドウハンドル - /// - /// Z オーダーを決めるためのウィンドウハンドル - /// - /// ・HWND_BOTTOM - /// 　ウィンドウを Z オーダーの最後に置きます。 - /// - /// ・hWnd - /// 　パラメタで指定したウィンドウが最前面の場合、 - /// 　このウィンドウは最前面ウィンドウではなくなり、 - /// 　ほかのすべてのウィンドウの下に置かれます。 - /// - /// ・HWND_NOTOPMOST - /// 　ウィンドウを最前面ウィンドウ以外のすべてのウィンドウの前 - /// 　（つまり、すべての最前面ウィンドウの後ろ）に挿入します。 - /// 　 - /// 　hWnd パラメータで指定したウィンドウが - /// 　既に最前面ウィンドウではなかった場合、 - /// 　このフラグは意味を持ちません。 - /// 　 - /// ・HWND_TOP - /// 　ウィンドウを Z オーダーの先頭に置きます。 - /// 　 - /// ・HWND_TOPMOST - /// 　ウィンドウを最前面ウィンドウではない - /// 　すべてのウィンドウの前に挿入します。 - /// 　このウィンドウは、アクティブでない - /// 　ときにも最前面に表示されます。 - /// - /// 横方向の位置 - /// 縦方向の位置 - /// 幅 - /// 高さ - /// - /// ウィンドウ位置のオプション - /// （詳細は上記のURLを参照のこと） - /// - /// - /// 成功：0 以外の値が返ります。 - /// 失敗：0 が返ります。 - /// 拡張エラー情報を取得するには、関数を使います。 - /// - [DllImport("user32.dll")] - [return: MarshalAs(UnmanagedType.Bool)] - private static extern bool SetWindowPos( - IntPtr hWnd, IntPtr hWndInsertAfter, - int x, int y, int cx, int cy, uint flags); - - #endregion - - #endregion - - /// - /// アプリケーションのメイン エントリ ポイントです。 - /// - [STAThread] - static void Main() - { -#if NETCOREAPP - // configの初期化 - GetConfigParameter.InitConfiguration("appsettings.json"); -#else -#endif - - // Add DefaultCulture key in app.Config file and take the culture value from app.Config file. - string culture = GetConfigParameter.GetConfigValue("DefaultCulture"); - if (!string.IsNullOrEmpty(culture)) - { - Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture(culture); - Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(culture); - } - - // exe名 - string exeName = Process.GetCurrentProcess().MainModule.ModuleName; - - // Mutexクラスの作成（exe名を利用する） - Program._mutex = new Mutex(false, exeName); - - // ミューテックスの所有権を要求する - if (Program._mutex.WaitOne(0, false) == false) - { - // 二重起動 - return; - } - else - { - // 二重起動でない。 - - // カレントディレクトリの退避 - // ファイル選択ダイアログでカレントディレクトリが変わる - - // コマンドライン起動しても - // ローカル ディレクトリを使用するように変更 - string[] temp = Process.GetCurrentProcess().MainModule.FileName.Split('\\'); - - for (int i = 0; i < temp.Length - 1; i++) - { - if (i == 0) - { - Program.OrgCurrentDirectory = temp[i]; - } - else - { - Program.OrgCurrentDirectory += "\\" + temp[i]; - } - } - - // コマンドライン：値 - List valsLst; - // コマンドライン：コマンド・値 - Dictionary argsDic; - - // コマンドライン引数を取得する。 - StringVariableOperator.GetCommandArgs('/', out argsDic, out valsLst); - - // ヘルプ - if (argsDic.ContainsKey("/HELP")) - { - // コンソール アタッチ - Program.AttachConsole(-1); - - Console.WriteLine(""); - - //Console.WriteLine("/HELP HELPを表示します。"); - //Console.WriteLine("/CUI CUIで起動します。"); - //Console.WriteLine(""); - //Console.WriteLine("以下、CUI時のみ有効なオプション引数"); - //Console.WriteLine(""); - //Console.WriteLine("/FORCE 履歴ファイルを消去して強制更新します。"); - //Console.WriteLine("/QUIET クワイエット モードで実行します（メッセージを非表示）。"); - //Console.WriteLine("/SILENT サイレント モードで実行します（メッセージ、進捗を非表示）。"); - //Console.WriteLine("/NB マニフェストファイルで起動指示アセンブリが指定されていても無視します。"); - //Console.WriteLine(""); - //Console.WriteLine("/WWWURL \"http://xxxx\" WWWサーバ上のマニュフェスト ファイルへのURLを指定します。"); - //Console.WriteLine(""); - //Console.WriteLine("/WWWUID xxxx WWWサーバへアクセスする際のユーザIDを指定します。"); - //Console.WriteLine("/WWWPWD xxxx WWWサーバへアクセスする際のパスワードを指定します。"); - //Console.WriteLine("/WWWDomain xxxx WWWサーバへアクセスする際のドメインを指定します。"); - //Console.WriteLine(""); - //Console.WriteLine("/ProxyURL \"http://yyyy\" ProxyサーバへのURLを指定します。"); - //Console.WriteLine(" 指定の無い場合は、IE設定を適用します。"); - //Console.WriteLine(" [none]指定時はプロキシを使用しません。"); - //Console.WriteLine(""); - //Console.WriteLine("/ProxyUID yyyy Proxyサーバへアクセスする際のユーザIDを指定します。"); - //Console.WriteLine("/ProxyPWD yyyy Proxyサーバへアクセスする際のパスワードを指定します。"); - //Console.WriteLine("/ProxyDomain yyyy Proxyサーバへアクセスする際のドメインを指定します。"); - //Console.WriteLine(""); - //Console.WriteLine("/UnIns \"http://xxxx\" WWWサーバ上のマニュフェスト ファイルへのURLを指定します（アンインストール）。"); - - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Console.WriteLine(ResourceMgr.GetString("A0001")); - Console.WriteLine(ResourceMgr.GetString("A0002")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0003")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0004")); - Console.WriteLine(ResourceMgr.GetString("A0005")); - Console.WriteLine(ResourceMgr.GetString("A0006")); - Console.WriteLine(ResourceMgr.GetString("A0007")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0008")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0009")); - Console.WriteLine(ResourceMgr.GetString("A0010")); - Console.WriteLine(ResourceMgr.GetString("A0011")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0012")); - Console.WriteLine(ResourceMgr.GetString("A0013")); - Console.WriteLine(ResourceMgr.GetString("A0014")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0015")); - Console.WriteLine(ResourceMgr.GetString("A0016")); - Console.WriteLine(ResourceMgr.GetString("A0017")); - Console.WriteLine(""); - Console.WriteLine(ResourceMgr.GetString("A0018")); - - // コンソール デタッチ - Program.FreeConsole(); - - return;　// 終了 - } - - // アンインストール - if (argsDic.ContainsKey("/UNINS")) - { - string url = argsDic["/UNINS"]; - - // 履歴をロード - Program.LoadHistories(); - - // 履歴の検索 - Entry history = null; - foreach (Entry entry in Program.Histories) - { - if (entry.WWWURL == url) - { - history = entry; - } - } - - if (history != null) - { - // 履歴を更新 - Program.Histories.Remove(history); - - // 履歴を保存 - Program.SaveHistories(); - - // インストール ディレクトリを削除 - if (Directory.Exists(history.InstallDir)) - { - Directory.Delete(history.InstallDir, true); - } - } - - return; - } - - // 起動の切り替え - if (argsDic.ContainsKey("/CUI")) - { - // 強制更新 - if (argsDic.ContainsKey("/FORCE")) - { - Program.IsForce = true; - - // 履歴ファイルを消去して実行 - File.Delete(Program.OrgCurrentDirectory + Program.HistoryFileName); - } - - // 起動アセンブリフラグ - if (argsDic.ContainsKey("/NB")) - { - Program.IsBoot = false; - } - - // CUI起動 - - // コンソール アタッチ - Program.AttachConsole(-1); - - //Program.OutPutMessage("CUI起動", LogLevel.InfoLog); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Program.OutPutMessage(ResourceMgr.GetString("M0006"), LogLevel.InfoLog); - - if (argsDic.ContainsKey("/SILENT")) - { - // 進捗ダイアログ＆メッセージなし - Program.CheckUpdateAndInstall_Silent(valsLst, argsDic); - } - else - { - // 進捗ダイアログ＆メッセージあり - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form2(valsLst, argsDic)); - } - - // コンソール デタッチ - Program.FreeConsole(); - } - else - { - // GUI起動 - //Program.OutPutMessage("GUI起動", LogLevel.InfoLog); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Program.OutPutMessage(ResourceMgr.GetString("M00007"), LogLevel.InfoLog); - - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } - } - - /// 更新チェック＆インストール（サイレントモード） - /// 値 - /// コマンド・値 - public static void CheckUpdateAndInstall_Silent(List valsLst, Dictionary argsDic) - { - try - { - // エントリを生成 - Entry entry = new Entry(); - - // コマンドラインから各値を取得する。 - entry.WWWURL = Program.NullToEmptyString(argsDic, "/WWWURL"); - entry.WWWUID = Program.NullToEmptyString(argsDic, "/WWWUID"); - entry.WWWPWD = Program.NullToEmptyString(argsDic, "/WWWPWD"); - entry.WWWDomain = Program.NullToEmptyString(argsDic, "/WWWDOMAIN"); - //--- - entry.ProxyURL = Program.NullToEmptyString(argsDic, "/PROXYURL"); - entry.ProxyUID = Program.NullToEmptyString(argsDic, "/PROXYUID"); - entry.ProxyPWD = Program.NullToEmptyString(argsDic, "/PROXYPWD"); - entry.ProxyDomain = Program.NullToEmptyString(argsDic, "/PROXYDOMAIN"); - - // エントリを保存 - Program.SaveCurrent(entry); - - // 履歴をロード - Program.LoadHistories(); - - // 更新処理の実行 - Program.ExecUpdate(entry); - - // 履歴を保存 - Program.SaveHistories(); - } - catch (MyException my_ex) - { - // 戻し - Program.Recover(); - - // メッセージ表示時 - string message = my_ex.Message; - - // ログ出力用のフィールドがあるか？ないか？ - if (string.IsNullOrEmpty(my_ex.ToLog)) - { - Program.OutPutMessage(message, LogLevel.InfoLog); - } - else - { - Program.OutPutMessage(message + "\r\n" + my_ex.ToLog, LogLevel.InfoLog); - } - } - catch (Exception ex) - { - // 戻し - Program.Recover(); - - // 例外発生時 - string message = ""; - - //message += "＜メッセージ＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0002")+"\r\n"; - message += ex.Message; - message += "\r\n"; - - message += "\r\n"; - //message += "＜スタック トレース＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0003")+"\r\n"; - message += ex.StackTrace; - message += "\r\n"; - - if (ex.InnerException != null) - { - message += "\r\n"; - //message += "＜内部例外＞\r\n"; - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - message += ResourceMgr.GetString("M0004")+"\r\n"; - message += ex.InnerException.ToString(); - message += "\r\n"; - } - - Program.OutPutMessage(message, LogLevel.ErrorLog); - } - finally - { - // テンポラリの削除 - File.Delete(Program.OrgCurrentDirectory + Program.TempMftFileName); - - // GCでZIPが解放される可能性 - //GC.Collect(); - Program.system_gc_collecting(); - try - { - File.Delete(Program.OrgCurrentDirectory + Program.TempZipFileName); - } - catch (Exception ex) - { - // 例外を潰してログに出力 - //Program.OutPutMessage(Program.TempZipFileName + "削除例外：" + ex.ToString(), LogLevel.ErrorLog); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Program.OutPutMessage(Program.TempZipFileName + ResourceMgr.GetString("M0008") + ex.ToString(), LogLevel.ErrorLog); - } - } - } - - /// nullは空文字列に変換する - /// ディクショナリ - /// キー - /// 出力文字列（nullを含まない） - public static string NullToEmptyString(Dictionary dic, string key) - { - if (dic.ContainsKey(key)) - { - return dic[key]; - } - else - { - return ""; - } - } - - #region 更新処理 - - /// 非同期フレームワーク - /// 進捗・メッセージ表示などで使用する - public static MyBaseAsyncFunc Af { set; get; } - - /// 更新処理 - /// エントリ, Form1 - /// 空のオブジェクト - /// 非同期処理から実行する - public static object ExecUpdate(object o) - { - // フラグをクリア - Program.HaveBackup = false; - Program.InstallDirectory = ""; - Program.BackupDirectory = ""; - - // ワーク - Process p = null; - - // エントリを初期化 - Entry entry = (Entry)o; - - // マニュフェスト ファイル上に - // 存在するZIPファイルのリスト - List existZipList = new List(); - - #region 履歴エントリを取得 - - // 履歴エントリを取得 - Entry history = null; - foreach (Entry temp in Program.Histories) - { - if (entry.WWWURL == temp.WWWURL) - { - history = temp; - break; - } - } - - #endregion - - #region 主処理 - - // HEAD（Last-Modifiedチェック） - bool lmcRet = false; - - try - { - lmcRet = Program.LastModifiedCheck_ByHead(entry, history, ""); - } - catch (WebException wex) - { - // WebExceptionで、 - if (history != null) - { - // 履歴あり - - // 更新されていない - lmcRet = false; - - // ログ出力して起動（正常終了する） - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("E0009"), entry.WWWURL) - + "\r\n" + wex.ToString(), LogLevel.InfoLog); - } - else - { - // 履歴なし - - //// リスロー - //throw; - - // 例外（MyException） - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0009"), - entry.WWWURL), wex.ToString()); - } - - #region 消し - - // SocketExceptionだけ - // ハンドルしようと考えていたが・・・ - - //if (wex.InnerException != null) - //{ - // // InnerException：!= null - - // if (wex.InnerException is SocketException) - // { - // // InnerException：ソケット例外 - // if (history != null) - // { - // // 履歴あり - // // 更新されていない - // lmcRet = false; - // } - // else - // { - // // 履歴なし - // // リスロー - // throw; - // } - // } - // else - // { - // // InnerException：その他 - // // リスロー - // throw; - // } - //} - //else - //{ - // // InnerException：== null - // // リスロー - // throw; - //} - - #endregion - } - - if (!lmcRet) - { - // 更新されていない - // 履歴エントリはそのまま - - #region 起動のチェック - - // → 起動exeのキック（historyから） - if (Program.IsBoot) - { - // /NB スイッチが指定されていない。 - if (Program.ExistProcess(history.InstallDir, history.StartExe, out p)) - { - // プロセスが起動されていない。 - - if (File.Exists(p.StartInfo.FileName)) - { - // ファイルが存在する。 - - // 起動する。 - p.Start(); - - // 最前面へ - Program.SetWindowPos( - p.MainWindowHandle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS); - } - else - { - // ファイルが存在しない。 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0001"), p.StartInfo.FileName)); - } - } - else - { - // プロセスが起動されている。 - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0002"), p.StartInfo.FileName)); - } - } - else - { - // /NB スイッチが指定されている。 - Program.OutPutMessage(GetMessage.GetMessageDescription("I0012"), LogLevel.InfoLog); - } - - #endregion - } - else - { - // 更新されている - - // 画面表示を更新 - if (Program.Af != null) - { - // 開始（進捗20％） - Program.Af.ExecChangeProgress(new ChangeProgressParameter( - string.Format(GetMessage.GetMessageDescription("I0001"), entry.WWWURL), 20)); - } - - // マニュフェスト ファイルを取得 - // GET、Content保存 - Program.GetAndSaveContent(entry, ""); - - // マニュフェスト ファイルを読む - FileStream fs = null; - StreamReader sr = null; - StringReader manifesto = null; - - try - { - fs = new FileStream( - Program.OrgCurrentDirectory - + Program.TempMftFileName, FileMode.Open); - - sr = new StreamReader(fs); - manifesto = new StringReader(sr.ReadToEnd()); - } - finally - { - if (sr != null) { sr.Close(); } - if (fs != null) { fs.Close(); } - } - - try - { - #region マニュフェスト ファイルの処理 - - // ZIPファイルを - // ・更新チェック - // ・ダウンロード - // ・インストール - string line = ""; - - // インストール ディレクトリ - line = manifesto.ReadLine().Trim(); - if (string.IsNullOrEmpty(line) || line.Length <= 4) - { - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - else - { - if (line.Substring(0, 3) == "ins") - { - // エントリに追加 - entry.InstallDir = StringVariableOperator. - BuiltStringIntoEnvironmentVariable(line.Substring(4)); - } - else - { - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - } - - // インストール ディレクトリの変更には対応しない。 - if (history != null) - { - if (history.InstallDir != entry.InstallDir) - { - //throw new Exception(string.Format( - // GetMessage.GetMessageDescription("E0003"), string.Format( - // "インストール ディレクトリが変更されています{0}。", line))); - - //For internationalization, Replaced all the Japanese language to GetMessage.GetMessageDescription() method call - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), string.Format( - GetMessage.GetMessageDescription("M0006"), line))); - } - } - - // 起動exe - line = manifesto.ReadLine().Trim(); - if (string.IsNullOrEmpty(line) || line.Length <= 4) - { - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - else - { - if (line.Substring(0, 3) == "exe") - { - // エントリに追加 - entry.StartExe = line.Substring(4); - } - else - { - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - } - - #endregion - - #region 起動のチェック - - if (Program.ExistProcess(entry.InstallDir, entry.StartExe, out p)) - { - // プロセスが起動されていない。→ 処理続行 - } - else - { - // プロセスが起動されている。→ 処理中止 - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0002"), p.StartInfo.FileName)); - } - - #endregion - - // 読み取り専用属性の全削除 - Program.RemoveReadonlyAttribute( - new DirectoryInfo(entry.InstallDir)); - - // 強制モードでは一度削除してから - if (Program.IsForce) - { - // 存在チェックを追加 - if (Directory.Exists(entry.InstallDir)) - { - Directory.Delete(entry.InstallDir, true); - } - } - - #region ZIPファイルのDL & Ins - - // ZIPファイル - line = manifesto.ReadLine(); - if (!string.IsNullOrEmpty(line)) - { - line.Trim(); - } - - string zipFile = ""; - bool isUpdated = false; - - while (true) - { - if (string.IsNullOrEmpty(line)) - { - // 終了 - break; - } - else if (line.Length <= 4) - { - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - else - { - if (line.Substring(0, 3) == "zip") - { - zipFile = line.Substring(4); - - if (zipFile.Length > 4 && - zipFile.Substring(zipFile.Length - 4, 4) == ".zip") - { - // エントリに追加 - entry.ZipFiles.Add(zipFile); - - // マニュフェスト ファイル上に - // 存在するZIPファイルを保存 - existZipList.Add(zipFile); - - // 画面表示を更新 - if (Program.Af != null) - { - // ZIPを確認（進捗＋8％） - Program.Af.ExecChangeProgress(new ChangeProgressParameter( - string.Format(GetMessage.GetMessageDescription("I0001"), zipFile), 8)); - } - - // HEAD（Last-Modifiedチェック） - if (Program.LastModifiedCheck_ByHead(entry, history, zipFile)) - { - // GET、Content保存 - Program.GetAndSaveContent(entry, zipFile); - - // ステータス変更 - isUpdated = true; - } - else - { - // ステータス変更 - isUpdated = false; - } - } - else - { - // 例外（.ZIPじゃない） - throw new Exception(GetMessage.GetMessageDescription("E0004") + zipFile); - } - } - else if (line.Substring(0, 3) == "md5") - { - // HEAD（Last-Modifiedチェック） - if (isUpdated) - { - string md5HashMft = line.Substring(4); - string md5HashCur = Program.GetMD5Hash( - Program.OrgCurrentDirectory + Program.TempZipFileName); - - if (md5HashMft == md5HashCur) - { - // 指定の位置にインストール - // （必要な履歴の情報を引き継ぐ） - Program.InstallZip(entry, zipFile, history, "utf-8"); - } - else - { - // 例外（MD5ハッシュの不一致） - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0005"), - zipFile, md5HashMft, md5HashCur)); - } - } - else - { - // 更新されていない - //（必要な履歴の情報を引き継ぐ） - entry.HttpZipLastModified[zipFile] = history.HttpZipLastModified[zipFile]; - entry.HttpZipContents[zipFile] = history.HttpZipContents[zipFile]; - // メッセージ（HeadAndLastModifiedで済み） - } - } - else - { - //// 終了 - //break; - - // マニュフェスト ファイルの不正 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0003"), line)); - } - } - - // 次へ - line = manifesto.ReadLine(); - if (!string.IsNullOrEmpty(line)) - { - line.Trim(); - } - } - } - finally - { - // クローズ（エラーになるので） - manifesto.Close(); - } - - #endregion - - // 画面表示を更新 - if (Program.Af != null) - { - // 終了（進捗－％）→最後に強制的に100％になる。 - Program.Af.ExecChangeProgress( - new ChangeProgressParameter( - GetMessage.GetMessageDescription("I0002"), 1)); - } - - #region 履歴エントリを保存 - - // 履歴を置き換える。 - for (int i = 0; i < Program.Histories.Count; i++) - { - if (Program.Histories[i].WWWURL == entry.WWWURL) - { - Program.Histories[i] = entry; - } - } - - if (history == null) - { - // 新規のエントリの場合だけ、 - // エントリを履歴に追加する。 - Program.Histories.Add(entry); - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0003"), entry.WWWURL), LogLevel.InfoLog); - } - else - { - // 旧エントリの場合だけ、 - // 無くなったZIPファイルを削除する。 - foreach (string zip1 in history.ZipFiles) - { - // 使ってないフラグ - bool isUnused = true; - - // 使ってないチェック - foreach (string zip2 in existZipList) - { - if (zip1 == zip2) - { - // ZIPファイルを使いました。 - isUnused = false; - } - } - - // このZIPファイルを使っていない。 - if (isUnused) - { - // ZIPファイル内のコンテンツを削除 - Program.DeleteZipContents(zip1, history); - - // ZIPファイルの情報を消す。 - entry.ZipFiles.Remove(zip1); - entry.HttpZipContents.Remove(zip1); - entry.HttpZipLastModified.Remove(zip1); - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0004"), zip1), LogLevel.InfoLog); - } - } - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0005"), entry.WWWURL), LogLevel.InfoLog); - } - - #endregion - - #region 起動のチェック - - // → 起動exeのキック（entryから） - if (Program.IsBoot) - { - // /NB スイッチが指定されていない。 - if (Program.ExistProcess(entry.InstallDir, entry.StartExe, out p)) - { - // プロセスが起動されていない。 - - if (File.Exists(p.StartInfo.FileName)) - { - // ファイルが存在する。 - - // バックアップ・ディレクトリを削除 - Program.DeleteBackupDirectory(); - - // 起動する。 - p.Start(); - - // 最前面へ - Program.SetWindowPos( - p.MainWindowHandle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS); - } - else - { - // ファイルが存在しない。 - throw new Exception(string.Format( - GetMessage.GetMessageDescription("E0001"), p.StartInfo.FileName)); - } - } - else - { - // プロセスが起動されている。 - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0002"), p.StartInfo.FileName)); - } - } - else - { - // バックアップ・ディレクトリを削除 - Program.DeleteBackupDirectory(); - - // /NB スイッチが指定されている。 - Program.OutPutMessage(GetMessage.GetMessageDescription("I0012"), LogLevel.InfoLog); - } - - #endregion - } - - #endregion - - return new object(); - } - - /// バックアップ・ディレクトリを削除 - private static void DeleteBackupDirectory() - { - if (Program.HaveBackup) - { - // インストール済み。 - Directory.Delete(Program.BackupDirectory, true); - } - } - - /// プロセススタートのためのオブジェクトを返す - /// インストール ディレクトリ - /// 起動EXE名のカンマ区切りリスト - /// プロセス - /// - /// 真：当該EXEは起動されていない。 - /// 偽：当該EXEは起動されている。 - /// - private static bool ExistProcess(string installDir, string exeFiles, out Process p) - { - // 分割する。 - string[] ary_exeFiles = exeFiles.Split(','); - - // パスに変換 - for (int i = 0; i < ary_exeFiles.Length; i++) - { - // プレーンな連結のみサポート - ary_exeFiles[i] = installDir + ary_exeFiles[i].Trim(); - } - - // プロセスを生成 - p = new Process(); - - // 二重起動のチェック - foreach (Process pp in System.Diagnostics.Process.GetProcesses()) - { - try - { - for (int i = 0; i < ary_exeFiles.Length; i++) - { - // ToUpper！ - if (ary_exeFiles[i].ToUpper() == pp.MainModule.FileName.ToUpper()) - { - // 起動されている。 - p.StartInfo = new ProcessStartInfo(ary_exeFiles[i]); - return false; - } - } - } - catch - { - // アクセス違反をつぶす。 - } - } - - // 起動されていない。 - p.StartInfo = new ProcessStartInfo(ary_exeFiles[0]); - return true; - } - - #endregion - - #region 共通関数 - - #region ファイルIO - - #region セーブ - - /// ファイルにセーブ - /// オブジェクト - /// ファイル パス - public static void SaveFile(object obj, string filePath) - { - FileStream fs = null; - - try - { - // バイナリ シリアライズしてファイル出力 - byte[] temp = BinarySerialize.ObjectToBytes(obj); - fs = new FileStream(filePath, FileMode.Create, FileAccess.Write); - - // バイト型配列の内容をすべて書き込む - fs.Write(temp, 0, temp.Length); - } - finally - { - // 閉じる - if (fs != null) { fs.Close(); } - } - } - - #endregion - - #region ロード - - /// ファイルをロード - /// ファイル パス - /// バイト配列 - public static byte[] LoadFile(string filePath) - { - byte[] ret = null; - FileStream fs = null; - MemoryStream ms = null; - - try - { - // ファイル入力をバイナリ デシリアライズ - if (File.Exists(filePath)) - { - fs = new FileStream(filePath, - FileMode.Open, FileAccess.Read); - - ms = new MemoryStream(); - byte[] buffer = new byte[0x1000]; // 4KB - - for (; ; ) - { - // ファイルの一部を読み込む - int readSize = fs.Read(buffer, 0, buffer.Length); - - // ファイルをすべて読み込んだときは終了する - if (readSize == 0) { break; } - - // マージ - ms.Write(buffer, 0, buffer.Length); - } - - // オブジェクト化して設定 - ret = ms.ToArray(); - } - } - finally - { - // 閉じる - if (ms != null) { ms.Close(); } - if (fs != null) { fs.Close(); } - } - - // 戻す。 - return ret; - } - - #endregion - - #region Current - - /// current.binのLoad処理 - /// Entry（前回入力） - public static Entry LoadCurrent() - { - byte[] current = null; - current = Program.LoadFile( - Program.OrgCurrentDirectory + Program.CurrentFileName); - - if (current == null) - { - return null; - } - else - { - return (Entry)BinarySerialize.BytesToObject(current); - } - } - - /// current.binのSave処理 - /// Entry（現状入力） - public static void SaveCurrent(Entry entry) - { - Program.SaveFile(entry, - Program.OrgCurrentDirectory + Program.CurrentFileName); - } - - #endregion - - #region Histories - - /// histories.binのLoad処理 - /// List＜Entry＞（履歴） - public static List LoadHistories() - { - byte[] current = null; - current = Program.LoadFile(Program.OrgCurrentDirectory + Program.HistoryFileName); - - if (current == null) - { - //return null; - Program.Histories = new List(); - } - else - { - //return (List)BinarySerialize.BytesToObject(current); - Program.Histories = (List)BinarySerialize.BytesToObject(current); - } - - // 設定しつつ戻す - return Program.Histories; - } - - /// histories.binのSave処理 - public static void SaveHistories() - { - Program.SaveFile(Program.Histories, Program.OrgCurrentDirectory + Program.HistoryFileName); - } - - #endregion - - #region 読み取り専用属性の削除 - - /// 削除処理の追加 - /// DirectoryInfo - /// - /// DOBON.NET > ファイル、フォルダ - /// 読み取り専用ファイルがあるときでもフォルダを削除する - /// http://dobon.net/vb/dotnet/file/deletedirectory.html - /// - public static void RemoveReadonlyAttribute(DirectoryInfo di) - { - if (di.Exists) - { - // 存在する場合 - - // 当該フォルダ（読み取り専用属性の削除） - if ((di.Attributes & FileAttributes.ReadOnly) - == FileAttributes.ReadOnly) - { - di.Attributes = FileAttributes.Normal; - } - - // フォルダ内のすべてのファイル - // （読み取り専用属性の削除） - foreach (FileInfo fi in di.GetFiles()) - { - if ((fi.Attributes & FileAttributes.ReadOnly) - == FileAttributes.ReadOnly) - { - fi.Attributes = FileAttributes.Normal; - } - } - - // 回帰 - foreach (DirectoryInfo child_di in di.GetDirectories()) - { - Program.RemoveReadonlyAttribute(child_di); - } - } - } - - #endregion - - #region ZIPファイル内のコンテンツの削除 - - /// ZIPファイル内のコンテンツの削除 - /// ZIPファイル名 - /// エントリ（履歴） - private static void DeleteZipContents(string zipFile, Entry history) - { - if (history != null) - { - // 履歴情報があれば、過去の解凍コンテンツを削除する。 - if (history.HttpZipContents.ContainsKey(zipFile)) - { - // ファイルパスを取得してコンテンツを削除 - foreach (string contentFile in history.HttpZipContents[zipFile]) - { - // 存在チェック - if (File.Exists(contentFile)) - { - // 存在しなくても例外を返さない。 - // ・・・と言いつつパスが - // 存在しないと例外となる。 - // ※ オープン状態では例外になる。 - try - { - File.Delete(contentFile); - } - catch - { - // 例外（オープン状態） - throw new MyException(string.Format( - GetMessage.GetMessageDescription("E0006"), contentFile)); - } - } - } - } - } - } - - #endregion - - #region 戻し操作 - - /// 戻し操作 - public static void Recover() - { - // バックアップが存在すれば、戻し操作を実行。 - if (Program.HaveBackup) - { - // 戻しを実行 - Program.OutPutMessage( - GetMessage.GetMessageDescription("E0008"), LogLevel.InfoLog); - - // 消す - Program.DeleteAllFile( - Program.InstallDirectory); - - // 戻す - Program.CreateMirror( - Program.BackupDirectory, - Program.InstallDirectory); - - // 退避ディレクトリを消去 - Program.DeleteBackupDirectory(); - } - } - - /// - /// すべてのファイルを消去する。 - /// ディレクトリは残して、例外はつぶす。 - /// - /// パス - private static void DeleteAllFile(string path) - { - // パスの存在チェック - if (Directory.Exists(path)) - { - // ファイルを全消しして - string[] files = Directory.GetFiles(path); - foreach (string file in files) - { - try - { - File.Delete(file); - } - catch - { - // 例外は潰す - } - } - - // ディレクトリを再起処理 - string[] directories = Directory.GetDirectories(path); - foreach (string directory in directories) - { - Program.DeleteAllFile(directory); - } - } - } - - /// ミラーを作成する。 - /// 退避したディレクトリ - /// インストール ディレクトリ - private static void CreateMirror(string src, string dst) - { - // パスの存在チェック - if (Directory.Exists(src)) - { - // ファイルをコピー - string[] files = Directory.GetFiles(src); - - // コピー先のディレクトリがなければ作成 - if (!Directory.Exists(dst)) - { - Directory.CreateDirectory(dst); - } - - // コピー - foreach (string file in files) - { - try - { - string[] temp = file.Split('\\'); - string fileName = temp[temp.Length - 1]; - - string dstFile = ""; - if (dst[dst.Length - 1] == '\\') - { - dstFile = dst + fileName; - } - else - { - dstFile = dst + "\\" + fileName; - } - - File.Copy(file, dstFile); - } - catch - { - // 例外は潰す - } - } - - // ディレクトリを再起処理 - string[] directories = Directory.GetDirectories(src); - foreach (string directory in directories) - { - Program.CreateMirror(directory, directory.Replace(src, dst)); - } - } - } - - #endregion - - #endregion - - #region MD5ハッシュ - - /// MD5ハッシュ値のBase64文字列を取得する。 - /// ファイル パス - /// MD5ハッシュ値のBase64文字列 - public static string GetMD5Hash(string FilePath) - { - // 暗号化サービスプロバイダ - // MD5CryptoServiceProviderサービスプロバイダ - HashAlgorithm ha = new MD5CryptoServiceProvider(); - - // ハッシュ値を計算する - return CustomEncode.ToBase64String( - ha.ComputeHash(Program.LoadFile(FilePath))); - } - - #endregion - - #region HTTP系メソッド - - #region HEAD - - /// HEAD（Last-Modifiedチェック） - /// エントリ - /// エントリ（履歴） - /// ZIPファイル - /// - /// true：更新あり、DLへ（インスコ） - /// false：更新なし、次へ（パス） - /// - public static bool LastModifiedCheck_ByHead(Entry entry, Entry history, string zipFile) - { - HttpWebRequest hwReq = null; - HttpWebResponse hwRes = null; - - try - { - hwReq = Program.GetHttpWebRequest(entry, zipFile); - hwReq.Timeout = 5000; - hwReq.Method = "HEAD"; - hwRes = (HttpWebResponse)hwReq.GetResponse(); - - // 更新日付のチェック - string httpLastModifiedHis = ""; - string httpLastModifiedWeb = hwRes.LastModified.ToString( - "yyyy-MM-dd HH:mm:ss:fff"); //.Headers["Last-Modified"]; - - if (httpLastModifiedWeb == null && httpLastModifiedWeb == "") - { - // 更新日付ヘッダなし - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0006"), hwReq.RequestUri.AbsoluteUri), LogLevel.InfoLog); - } - else - { - // 更新日付の更新 - if (string.IsNullOrEmpty(zipFile)) - { - // マニュフェスト ファイルの場合 - entry.HttpLastModified = httpLastModifiedWeb; - } - else - { - // ZIPファイルの場合 - entry.HttpZipLastModified[zipFile] = httpLastModifiedWeb; - } - - // 履歴エントリの更新日付の履歴をチェックする。 - if (history != null) - { - // 履歴あり - - if (string.IsNullOrEmpty(zipFile)) - { - // マニュフェスト ファイルの場合 - httpLastModifiedHis = history.HttpLastModified; - } - else - { - // ZIPファイルの場合 - // 無い場合があるので - if (history.HttpZipLastModified.ContainsKey(zipFile)) - { - httpLastModifiedHis = history.HttpZipLastModified[zipFile]; - } - else - { - // NullOrEmptyにしない - //（↓の更新日付ヘッダの不一致へ） - httpLastModifiedHis = "xxx"; - } - } - - // 更新日付の履歴あり - if (!string.IsNullOrEmpty(httpLastModifiedHis)) - { - if (httpLastModifiedHis == httpLastModifiedWeb) - { - // 更新日付ヘッダの一致 - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0007"), hwReq.RequestUri.AbsoluteUri), LogLevel.InfoLog); - - // → パス - return false; - } - else - { - // 更新日付ヘッダの不一致（大小の評価ではない！） - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0008"), hwReq.RequestUri.AbsoluteUri), LogLevel.InfoLog); - } - } - } - else - { - // 履歴なし - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0009"), hwReq.RequestUri.AbsoluteUri), LogLevel.InfoLog); - } - } - - // → インスコ - return true; - } - finally - { - // 閉じる（これが無いと２回目実行できない。） - if (hwRes != null) { hwRes.Close(); } - if (hwReq != null) { hwReq.Abort(); } - } - } - - #endregion - - #region GET - - /// ファイルを取得 - /// エントリ - /// ZIPファイル - public static void GetAndSaveContent(Entry entry, string zipFile) - { - HttpWebRequest hwReq = null; - HttpWebResponse hwRes = null; - - try - { - hwReq = Program.GetHttpWebRequest(entry, zipFile); - hwReq.Timeout = 5000; - hwReq.Method = "GET"; - hwRes = (HttpWebResponse)hwReq.GetResponse(); - - if (hwRes.ContentLength != -1) - { - Stream sm = null; - FileStream fs = null; - - try - { - // 応答データを受信するためのStreamを取得 - sm = hwRes.GetResponseStream(); - - // ファイルに書き込むためのFileStreamを作成 - string saveFileName = ""; - - if (string.IsNullOrEmpty(zipFile)) - { - // マニュフェスト - saveFileName = Program.TempMftFileName; - } - else - { - // ZIPファイル - saveFileName = Program.TempZipFileName; - } - - fs = new FileStream( - Program.OrgCurrentDirectory + saveFileName, FileMode.Create, FileAccess.Write); - - // 応答データをファイルに書き込む - int b; - while ((b = sm.ReadByte()) != -1) - { - fs.WriteByte(Convert.ToByte(b)); - } - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0010"), hwReq.RequestUri.AbsoluteUri), LogLevel.InfoLog); - } - finally - { - // 閉じる - if (fs != null) { fs.Close(); } - if (sm != null) { sm.Close(); } - } - } - } - finally - { - // 閉じる（これが無いと２回目実行できない。） - if (hwRes != null) { hwRes.Close(); } - if (hwReq != null) { hwReq.Abort(); } - } - } - - #endregion - - #region new HttpWebRequest - - /// HttpWebRequestを取得する。 - /// エントリ - /// ZIPファイル名 - /// HttpWebRequest - public static HttpWebRequest GetHttpWebRequest(Entry entry, string zipFile) - { - string zipURL = entry.WWWURL; - HttpWebRequest hwReq = null; - - if (!string.IsNullOrEmpty(zipFile)) - { - // ファイル指定がされている場合。 - // マニュフェスト ファイルを・・・ - string[] temp = zipURL.Split('/'); - for (int i = 0; i < temp.Length - 1; i++) - { - if (i == 0) - { - zipURL = temp[i]; - } - else - { - zipURL += "/" + temp[i]; - } - } - - // ZIPファイルに置き換える。 - zipURL += "/" + zipFile; - } - - // リクエストを生成する。 - hwReq = (HttpWebRequest)HttpWebRequest.Create(new Uri(zipURL)); - - // WWWサーバのNetworkCredential - if (entry.WWWUID == null && entry.WWWUID == "") - { - // NetworkCredentialなし（デフォルト） - //hwReq.UseDefaultCredentials = true;// ★要・検討 - } - else - { - // NetworkCredentialあり - if (entry.WWWDomain == null || entry.WWWDomain == "") - { - // UID、PWD - hwReq.Credentials = new NetworkCredential( - entry.WWWUID, entry.WWWPWD); - } - else - { - // UID、PWD、Domain - hwReq.Credentials = new NetworkCredential( - entry.WWWUID, entry.WWWPWD, entry.WWWDomain); - } - } - - // プロキシ使うか？ - WebProxy proxy = null; - - // Proxyサーバ - if (entry.ProxyURL.ToLower() == "none") - { - // Proxyサーバなし（null） - hwReq.Proxy = null; - - // ※ GlobalProxySelection.GetEmptyWebProxy()は古い形式 - } - else if (entry.ProxyURL == null || entry.ProxyURL == "") - { - // proxy = (WebProxy)WebProxy.GetDefaultProxy();// 古い形式 - // 何もしない → DefaultWebProxyプロパティの値を使用する。 - } - else - { - // Proxyサーバあり - proxy = new WebProxy(new Uri(entry.ProxyURL)); - } - - // Proxyサーバがあれば - if (proxy != null) - { - // NetworkCredentialがあれば - if (entry.ProxyUID == null || entry.ProxyUID == "") - { - // NetworkCredentialなし（デフォルト） - proxy.UseDefaultCredentials = true;// ★要・検討 - } - else - { - // NetworkCredentialあり - if (entry.ProxyDomain == null || entry.ProxyDomain == "") - { - // UID、PWD - proxy.Credentials = new NetworkCredential( - entry.ProxyUID, entry.ProxyPWD); - } - else - { - // UID、PWD、Domain - proxy.Credentials = new NetworkCredential( - entry.ProxyUID, entry.ProxyPWD, entry.ProxyDomain); - } - } - - // プロキシ設定 - hwReq.Proxy = proxy; - } - - return hwReq; - } - - #endregion - - #endregion - - #region インストール - - /// ZIPファイルをインストール - /// エントリ - /// ZIPファイル名 - /// エントリ（履歴） - /// エンコーディング - public static void InstallZip(Entry entry, string zipFile, Entry history, string encStr) - { - if (Program.HaveBackup) - { - // バックアップ済み。 - } - else - { - if (Directory.Exists(entry.InstallDir)) - { - // インストール先を指定 - Program.InstallDirectory = entry.InstallDir; - - // バックアップ先を指定 - string guid = Guid.NewGuid().ToString(); - if (entry.InstallDir[entry.InstallDir.Length - 1] == '\\') - { - Program.BackupDirectory = - entry.InstallDir.Substring( - 0, entry.InstallDir.Length - 1) + "_" + guid; - } - else - { - Program.BackupDirectory = entry.InstallDir + "_" + guid; - } - - // バックアップする。 - Program.HaveBackup = true; - FileSystem.CopyDirectory(entry.InstallDir, BackupDirectory, UIOption.OnlyErrorDialogs, UICancelOption.DoNothing); - } - } - - // ZIPファイル内のコンテンツを削除 - Program.DeleteZipContents(zipFile, history); - - // 環境変数に対応 - string InsDir = StringVariableOperator. - BuiltStringIntoEnvironmentVariable(entry.InstallDir); - - // 解凍 - - // 解凍部品 - UnZipper uz = new UnZipper(); - - // 選択基準なしで - string[] exts = null; - Zipper.SelectionDelegate scd = null; - - //if (this.txtExt.Enabled) - //{ - // exts = this.txtExt.Text.Split(','); - // scd = SelectionCriteriaDlgt2; - //} - - // 解凍時、上書き制御 - uz.ExtractProgress = Program.MyExtractProgressEventHandler; - - // 解凍（１）デリゲートでフィルタ - uz.ExtractFileFromZip( - Program.OrgCurrentDirectory + Program.TempZipFileName, - StringVariableOperator.BuiltStringIntoEnvironmentVariable(entry.InstallDir), - scd, exts, ExtractExistingFileAction.OverwriteSilently, - Encoding.GetEncoding(encStr), ""); - - // メッセージ - Program.OutPutMessage(string.Format( - GetMessage.GetMessageDescription("I0011"), zipFile), LogLevel.InfoLog); - - // 解凍先のファイルのパスを抽出 - string header = "extract file "; - StringReader srZipContents = new StringReader(uz.StatusMSG); - List zipContents = new List(); - - string tempContentFile = srZipContents.ReadLine(); - while (tempContentFile != null && tempContentFile.Trim() != "") - { - if (tempContentFile.IndexOf(header) == 0) - { - // 解凍先のファイルのパスを抽出（[- 3] は[...]の分） - zipContents.Add(tempContentFile.Substring(header.Length, tempContentFile.Length - header.Length - 3)); - } - - // 次へ - tempContentFile = srZipContents.ReadLine(); - } - - // 解凍先のファイルのパスを保存する（次回の削除処理に使用）。 - entry.HttpZipContents[zipFile] = zipContents.ToArray(); - } - - #endregion - - #region デリゲート - - #region 選択基準デリゲート - - /// 選択基準を実装するデリゲート - /// ファイル・エントリ情報 - /// 選択規準情報 - /// - /// 真：ファイルを書庫に追加する。 - /// 偽：ファイルを書庫に追加しない。 - /// - public static bool SelectionCriteriaDlgt1(object o, object info) - { - FileInfo f = (FileInfo)o; - - // 選択規準情報（文字列配列）の - // 指定が無い場合は、全て[true] - - if (info == null) - { - return true; - } - - // 選択規準情報（文字列配列）の - // 指定がある場合は、[true], [false]か判別 - - string[] exts = (string[])info; - foreach (string ext in exts) - { - if (f.Extension == "." + ext.Trim()) - { - return false; - } - } - - return true; - } - - /// 選択基準を実装するデリゲート - /// ファイル・エントリ情報 - /// 選択規準情報 - /// - /// 真：ファイルを書庫に追加する。 - /// 偽：ファイルを書庫に追加しない。 - /// - public static bool SelectionCriteriaDlgt2(object o, object info) - { - string fileName = (string)o; - - // 選択規準情報（文字列配列）の - // 指定が無い場合は、全て[true] - - if (info == null) - { - return true; - } - - // 選択規準情報（文字列配列）の - // 指定がある場合は、[true], [false]か判別 - - string[] exts = (string[])info; - foreach (string ext in exts) - { - string[] aryStr = fileName.Split('.'); // 修正 - if (aryStr[aryStr.Length - 1] == ext.Trim()) - { - return false; - } - } - - return true; - } - - #endregion - - #region 組込デリゲート - - /// セーブ処理の進捗表示デリゲート - public static void MySaveProgressEventHandler(Object sender, SaveProgressEventArgs e) - { - if (e.EventType == ZipProgressEventType.Saving_Started) - { - // 書庫の作成を開始 - //Debug.WriteLine(string.Format("{0} の作成開始", e.ArchiveName)); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0001"), e.ArchiveName)); - } - else if (e.EventType == ZipProgressEventType.Saving_BeforeWriteEntry) - { - // エントリの書き込み開始 - //Debug.WriteLine(string.Format("{0} の書き込み開始", e.CurrentEntry.FileName)); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0002"), e.CurrentEntry.FileName)); - } - else if (e.EventType == ZipProgressEventType.Saving_EntryBytesRead) - { - // エントリを書き込み中 - //Debug.WriteLine(string.Format("{0}/{1} バイト 書き込みました", e.BytesTransferred, e.TotalBytesToTransfer)); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0003"), e.BytesTransferred, e.TotalBytesToTransfer)); - } - else if (e.EventType == ZipProgressEventType.Saving_AfterWriteEntry) - { - // エントリの書き込み終了 - //Debug.WriteLine(string.Format("{0} の書き込み終了", e.CurrentEntry.FileName)); - //Debug.WriteLine(string.Format("{0} 個中 {1} 個のエントリの書き込みが完了しました", e.EntriesTotal, e.EntriesSaved)); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0004"), e.CurrentEntry.FileName)); - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0005"), e.EntriesTotal, e.EntriesSaved)); - - } - else if (e.EventType == ZipProgressEventType.Saving_Completed) - { - // 書庫の作成が完了 - //Debug.WriteLine(string.Format("{0} の作成終了", e.ArchiveName)); - - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - Debug.WriteLine(string.Format(ResourceMgr.GetString("I0006"), e.ArchiveName)); - } - } - - /// 上書き確認デリゲート - public static void MyExtractProgressEventHandler(Object sender, ExtractProgressEventArgs e) - { - if (e.EventType == ZipProgressEventType.Extracting_ExtractEntryWouldOverwrite) - { - // 展開するファイル名 - string filePath = Path.Combine( - e.ExtractLocation, e.CurrentEntry.FileName.Replace('/', '\\')); - - // ダイアログを表示する - //DialogResult res = MessageBox.Show( - // "'" + filePath + "'はすでに存在します。\r\n" + - // "'はい'で上書き 'いいえ'で何もしない 'キャンセル'で中止", - // "上書きの確認", - // MessageBoxButtons.YesNoCancel, - // MessageBoxIcon.Question); - - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - DialogResult res = MessageBox.Show( - "'" + filePath + ResourceMgr.GetString("M0009")+ "\r\n" + - ResourceMgr.GetString("M0010"), - ResourceMgr.GetString("M0011"), - MessageBoxButtons.YesNoCancel, - MessageBoxIcon.Question); - - if (res == DialogResult.Yes) - { - // 上書きする - e.CurrentEntry.ExtractExistingFile = - ExtractExistingFileAction.OverwriteSilently; - } - else if (res == DialogResult.No) - { - // 上書きしない - e.CurrentEntry.ExtractExistingFile = - ExtractExistingFileAction.DoNotOverwrite; - } - else if (res == DialogResult.Cancel) - { - // 展開を中止する - e.Cancel = true; - } - } - } - - #endregion - - #endregion - - #region メッセージ表示 - - /// メッセージを表示する。 - /// メッセージ - /// ログ・レベル - public static void OutPutMessage(string message, LogLevel lb) - { - Debug.WriteLine(message); - Console.WriteLine(message); - - switch (lb) - { - case LogLevel.DebugLog: - LogIF.DebugLog("ACCESS", message); - break; - case LogLevel.InfoLog: - LogIF.InfoLog("ACCESS", message); - break; - case LogLevel.WarnLog: - LogIF.WarnLog("ACCESS", message); - break; - case LogLevel.ErrorLog: - LogIF.ErrorLog("ACCESS", message); - break; - case LogLevel.FatalLog: - LogIF.FatalLog("ACCESS", message); - break; - } - } - - /// コマンドの確認 - /// 値 - /// コマンド・値 - public static void ConfirmCommand(List valsLst, Dictionary argsDic) - { - // 整形 - StringBuilder sb = new StringBuilder(); - - sb.AppendLine(""); - - // カレント ディレクトリ - //sb.AppendLine("カレント ディレクトリ"); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - sb.AppendLine(ResourceMgr.GetString("M0012")); - sb.AppendLine(Program.OrgCurrentDirectory); - - sb.AppendLine(""); - - // 起動条件 - //sb.AppendLine("起動条件"); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - sb.AppendLine(ResourceMgr.GetString("M0013")); - - sb.AppendLine(""); - - // 値 - //sb.AppendLine("値"); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - sb.AppendLine(ResourceMgr.GetString("M0014")); - foreach (string vals in valsLst) - { - sb.AppendLine(vals); - } - - sb.AppendLine(""); - - // コマンド・値 - //sb.AppendLine("コマンド・値"); - //For internationalization, Replaced all the Japanese language to ResourceMgr.GetString() method call - sb.AppendLine(ResourceMgr.GetString("M0015")); - foreach (string key in argsDic.Keys) - { - sb.AppendLine(string.Format("{0} : {1}", key, argsDic[key])); - } - - // 出力 - Program.OutPutMessage(sb.ToString(), LogLevel.DebugLog); - } - - #endregion - - #endregion - - /// - /// GCする際のお作法 - /// WaitForPendingFinalizersで待機 - /// → 解凍ZIPファイルをCloseさせる - /// - public static void system_gc_collecting() - { - try - { - System.GC.Collect(); - System.GC.WaitForPendingFinalizers(); - System.GC.Collect(); - } -#pragma warning disable - catch (Exception ex) -#pragma warning restore - { - // ・・・ - } - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs deleted file mode 100644 index de66f144a..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,64 +0,0 @@ -//********************************************************************************** -//* Copyright (C) 2007,2016 Hitachi Solutions,Ltd. -//********************************************************************************** - -#region Apache License -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -#endregion - -//********************************************************************************** -//* クラス名 ：AssemblyInfo -//* クラス日本語名 ：AssemblyInfo設定 -//* -//* 作成者 ：生技 西野 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 20xx/xx/xx ＸＸ ＸＸ 新規作成 -//********************************************************************************** - -using System.Reflection; -using System.Runtime.InteropServices; - -// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 -// アセンブリに関連付けられている情報を変更するには、 -// これらの属性値を変更してください。 -[assembly: AssemblyTitle("DeployZipPackWithHTTP")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Hitachi Solutions")] -[assembly: AssemblyProduct("DeployZipPackWithHTTP")] -[assembly: AssemblyCopyright("Copyright (C) 2007,2016 Hitachi Solutions,Ltd.")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントには -// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、 -// その型の ComVisible 属性を true に設定してください。 -[assembly: ComVisible(false)] - -// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です -[assembly: Guid("24f1957f-ecac-47ef-9331-9ac987a82e8e")] - -// アセンブリのバージョン情報は、以下の 4 つの値で構成されています: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs deleted file mode 100644 index c95192591..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.Designer.cs +++ /dev/null @@ -1,495 +0,0 @@ -//------------------------------------------------------------------------------ -// -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 -// -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 -// -//------------------------------------------------------------------------------ - -namespace DeployZipPackWithHTTP.Resources { - using System; - - - /// - /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 - /// - // このクラスは StronglyTypedResourceBuilder クラスが ResGen - // または Visual Studio のようなツールを使用して自動生成されました。 - // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に - // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resource { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resource() { - } - - /// - /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeployZipPackWithHTTP.Resources.Resource", typeof(Resource).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// すべてについて、現在のスレッドの CurrentUICulture プロパティをオーバーライドします - /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// /HELP Show me the HELP. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0001 { - get { - return ResourceManager.GetString("A0001", resourceCulture); - } - } - - /// - /// /CUI I will start in CUI CUI. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0002 { - get { - return ResourceManager.GetString("A0002", resourceCulture); - } - } - - /// - /// Below, valid options argument only when CUI に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0003 { - get { - return ResourceManager.GetString("A0003", resourceCulture); - } - } - - /// - /// / Force update to erase the FORCE history file. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0004 { - get { - return ResourceManager.GetString("A0004", resourceCulture); - } - } - - /// - /// /QUIET (Hide the message) that you can run in quiet mode . に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0005 { - get { - return ResourceManager.GetString("A0005", resourceCulture); - } - } - - /// - /// /SILENT (Hide message, the progress) that will run in silent mode. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0006 { - get { - return ResourceManager.GetString("A0006", resourceCulture); - } - } - - /// - /// /NB Ignore start instruction assembly even if they are specified in the manifest file. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0007 { - get { - return ResourceManager.GetString("A0007", resourceCulture); - } - } - - /// - /// /WWWURL I Specifies the URL to the manifest file of \ "http://xxxx \" WWW server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0008 { - get { - return ResourceManager.GetString("A0008", resourceCulture); - } - } - - /// - /// /WWWUID xxxx WWW Specifies the user ID when accessing the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0009 { - get { - return ResourceManager.GetString("A0009", resourceCulture); - } - } - - /// - /// /WWWPWD xxxx WWW Specifies the password used to access the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0010 { - get { - return ResourceManager.GetString("A0010", resourceCulture); - } - } - - /// - /// /WWWDomain xxxx WWW You specify the domain when accessing to the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0011 { - get { - return ResourceManager.GetString("A0011", resourceCulture); - } - } - - /// - /// /ProxyURL \"http://yyyy\" Proxy I specify the URL to the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0012 { - get { - return ResourceManager.GetString("A0012", resourceCulture); - } - } - - /// - /// If it is not specified, and then apply the IE setting. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0013 { - get { - return ResourceManager.GetString("A0013", resourceCulture); - } - } - - /// - /// It does not use a proxy [none] is specified. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0014 { - get { - return ResourceManager.GetString("A0014", resourceCulture); - } - } - - /// - /// /ProxyUID yyyy Proxy Specifies the user ID when accessing the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0015 { - get { - return ResourceManager.GetString("A0015", resourceCulture); - } - } - - /// - /// /ProxyPWD yyyy Proxy Specifies the password used to access the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0016 { - get { - return ResourceManager.GetString("A0016", resourceCulture); - } - } - - /// - /// /ProxyDomain yyyy Proxy You specify the domain when accessing to the server. に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0017 { - get { - return ResourceManager.GetString("A0017", resourceCulture); - } - } - - /// - /// /UnIns \"http://xxxx\" WWW Specify the URL to the manifest file on the server (uninstall). に類似しているローカライズされた文字列を検索します。 - /// - internal static string A0018 { - get { - return ResourceManager.GetString("A0018", resourceCulture); - } - } - - /// - /// An error has occurred. に類似しているローカライズされた文字列を検索します。 - /// - internal static string E0001 { - get { - return ResourceManager.GetString("E0001", resourceCulture); - } - } - - /// - /// Delete Exception: に類似しているローカライズされた文字列を検索します。 - /// - internal static string E0002 { - get { - return ResourceManager.GetString("E0002", resourceCulture); - } - } - - /// - /// Error に類似しているローカライズされた文字列を検索します。 - /// - internal static string Error0001 { - get { - return ResourceManager.GetString("Error0001", resourceCulture); - } - } - - /// - /// Summary (compression) に類似しているローカライズされた文字列を検索します。 - /// - internal static string Error0002 { - get { - return ResourceManager.GetString("Error0002", resourceCulture); - } - } - - /// - /// Summary (De) に類似しているローカライズされた文字列を検索します。 - /// - internal static string Error0003 { - get { - return ResourceManager.GetString("Error0003", resourceCulture); - } - } - - /// - /// ZIP file |*.Zip に類似しているローカライズされた文字列を検索します。 - /// - internal static string EXT0001 { - get { - return ResourceManager.GetString("EXT0001", resourceCulture); - } - } - - /// - /// Production start of {0} に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0001 { - get { - return ResourceManager.GetString("I0001", resourceCulture); - } - } - - /// - /// Write start of {0} に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0002 { - get { - return ResourceManager.GetString("I0002", resourceCulture); - } - } - - /// - /// I wrote {0} / {1} bytes に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0003 { - get { - return ResourceManager.GetString("I0003", resourceCulture); - } - } - - /// - /// Write end of {0} に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0004 { - get { - return ResourceManager.GetString("I0004", resourceCulture); - } - } - - /// - /// Writing of entry for {1} (s) has (have) completed {0} or in に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0005 { - get { - return ResourceManager.GetString("I0005", resourceCulture); - } - } - - /// - /// Creation end of {0} に類似しているローカライズされた文字列を検索します。 - /// - internal static string I0006 { - get { - return ResourceManager.GetString("I0006", resourceCulture); - } - } - - /// - /// Message に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0001 { - get { - return ResourceManager.GetString("M0001", resourceCulture); - } - } - - /// - /// <Message> に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0002 { - get { - return ResourceManager.GetString("M0002", resourceCulture); - } - } - - /// - /// <Stack trace> に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0003 { - get { - return ResourceManager.GetString("M0003", resourceCulture); - } - } - - /// - /// <Internal exception> に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0004 { - get { - return ResourceManager.GetString("M0004", resourceCulture); - } - } - - /// - /// Message に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0005 { - get { - return ResourceManager.GetString("M0005", resourceCulture); - } - } - - /// - /// CUI start に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0006 { - get { - return ResourceManager.GetString("M0006", resourceCulture); - } - } - - /// - /// GUI boot に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0007 { - get { - return ResourceManager.GetString("M0007", resourceCulture); - } - } - - /// - /// Delete Exception: に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0008 { - get { - return ResourceManager.GetString("M0008", resourceCulture); - } - } - - /// - /// 'Already exists. に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0009 { - get { - return ResourceManager.GetString("M0009", resourceCulture); - } - } - - /// - /// You do not do anything with 'no' overwrite with 'yes' stop 'Cancel' に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0010 { - get { - return ResourceManager.GetString("M0010", resourceCulture); - } - } - - /// - /// Overwrite Confirmation に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0011 { - get { - return ResourceManager.GetString("M0011", resourceCulture); - } - } - - /// - /// Current directory に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0012 { - get { - return ResourceManager.GetString("M0012", resourceCulture); - } - } - - /// - /// Start-up conditions に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0013 { - get { - return ResourceManager.GetString("M0013", resourceCulture); - } - } - - /// - /// Value に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0014 { - get { - return ResourceManager.GetString("M0014", resourceCulture); - } - } - - /// - /// Command value に類似しているローカライズされた文字列を検索します。 - /// - internal static string M0015 { - get { - return ResourceManager.GetString("M0015", resourceCulture); - } - } - - /// - /// Successful completion に類似しているローカライズされた文字列を検索します。 - /// - internal static string S0001 { - get { - return ResourceManager.GetString("S0001", resourceCulture); - } - } - - /// - /// Abnormal termination に類似しているローカライズされた文字列を検索します。 - /// - internal static string S0002 { - get { - return ResourceManager.GetString("S0002", resourceCulture); - } - } - - /// - /// Compression に類似しているローカライズされた文字列を検索します。 - /// - internal static string T0001 { - get { - return ResourceManager.GetString("T0001", resourceCulture); - } - } - } -} diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx deleted file mode 100644 index 319105fa5..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.ja-JP.resx +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - /HELP HELPを表示します。 - - - /CUI CUIで起動します。 - - - 以下、CUI時のみ有効なオプション引数 - - - /FORCE 履歴ファイルを消去して強制更新します。 - - - /QUIET クワイエット モードで実行します（メッセージを非表示）。 - - - /SILENT サイレント モードで実行します（メッセージ、進捗を非表示）。 - - - /NB マニフェストファイルで起動指示アセンブリが指定されていても無視します。 - - - /WWWURL \"http://xxxx\" WWWサーバ上のマニュフェスト ファイルへのURLを指定します。 - - - /WWWUID xxxx WWWサーバへアクセスする際のユーザIDを指定します。 - - - /WWWPWD xxxx WWWサーバへアクセスする際のパスワードを指定します。 - - - /WWWDomain xxxx WWWサーバへアクセスする際のドメインを指定します。 - - - /ProxyURL \"http://yyyy\" ProxyサーバへのURLを指定します。 - - - 指定の無い場合は、IE設定を適用します。 - - - [none]指定時はプロキシを使用しません。 - - - /ProxyUID yyyy Proxyサーバへアクセスする際のユーザIDを指定します。 - - - /ProxyPWD yyyy Proxyサーバへアクセスする際のパスワードを指定します。 - - - /ProxyDomain yyyy Proxyサーバへアクセスする際のドメインを指定します。 - - - /UnIns \"http://xxxx\" WWWサーバ上のマニュフェスト ファイルへのURLを指定します（アンインストール）。 - - - エラーが発生しました。 - - - 削除例外： - - - エラー - - - サマリ（圧縮） - - - サマリ（解凍） - - - ZIPファイル|*.zip - - - {0} の作成開始 - - - {0} の書き込み開始 - - - {0}/{1} バイト 書き込みました - - - {0} の書き込み終了 - - - {0} 個中 {1} 個のエントリの書き込みが完了しました - - - {0} の作成終了 - - - メッセージ - - - ＜メッセージ＞ - - - ＜スタック トレース＞ - - - ＜内部例外＞ - - - メッセージ - - - CUI起動 - - - GUI起動 - - - 削除例外： - - - 'はすでに存在します。 - - - 'はい'で上書き 'いいえ'で何もしない 'キャンセル'で中止 - - - 上書きの確認 - - - カレント ディレクトリ - - - 起動条件 - - - 値 - - - コマンド・値 - - - 正常終了 - - - 異常終了 - - - 圧縮 - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx deleted file mode 100644 index 4c1925f35..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Resources/Resource.resx +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - /HELP Show me the HELP. - - - /CUI I will start in CUI CUI. - - - Below, valid options argument only when CUI - - - / Force update to erase the FORCE history file. - - - /QUIET (Hide the message) that you can run in quiet mode . - - - /SILENT (Hide message, the progress) that will run in silent mode. - - - /NB Ignore start instruction assembly even if they are specified in the manifest file. - - - /WWWURL I Specifies the URL to the manifest file of \ "http://xxxx \" WWW server. - - - /WWWUID xxxx WWW Specifies the user ID when accessing the server. - - - /WWWPWD xxxx WWW Specifies the password used to access the server. - - - /WWWDomain xxxx WWW You specify the domain when accessing to the server. - - - /ProxyURL \"http://yyyy\" Proxy I specify the URL to the server. - - - If it is not specified, and then apply the IE setting. - - - It does not use a proxy [none] is specified. - - - /ProxyUID yyyy Proxy Specifies the user ID when accessing the server. - - - /ProxyPWD yyyy Proxy Specifies the password used to access the server. - - - /ProxyDomain yyyy Proxy You specify the domain when accessing to the server. - - - /UnIns \"http://xxxx\" WWW Specify the URL to the manifest file on the server (uninstall). - - - An error has occurred. - - - Delete Exception: - - - Error - - - Summary (compression) - - - Summary (De) - - - ZIP file |*.Zip - - - Production start of {0} - - - Write start of {0} - - - I wrote {0} / {1} bytes - - - Write end of {0} - - - Writing of entry for {1} (s) has (have) completed {0} or in - - - Creation end of {0} - - - Message - - - <Message> - - - <Stack trace> - - - <Internal exception> - - - Message - - - CUI start - - - GUI boot - - - Delete Exception: - - - 'Already exists. - - - You do not do anything with 'no' overwrite with 'yes' stop 'Cancel' - - - Overwrite Confirmation - - - Current directory - - - Start-up conditions - - - Value - - - Command value - - - Successful completion - - - Abnormal termination - - - Compression - - \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav deleted file mode 100644 index a6a9cc84d..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave1.wav and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav deleted file mode 100644 index a6a9cc84d..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave2.wav and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav deleted file mode 100644 index a6a9cc84d..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/Wave3.wav and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_1.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_2.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/Excel 97-2003_3.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe deleted file mode 100644 index 16ad51dd8..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/aaa/top1.exe and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_1.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_2.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/PPT 97-2003_3.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe deleted file mode 100644 index 16ad51dd8..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/bbb/top2.exe and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_1.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_2.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/Word 97-2003_3.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe deleted file mode 100644 index 16ad51dd8..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/ccc/top3.exe and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe deleted file mode 100644 index 16ad51dd8..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/top.exe and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_1.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_2.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls deleted file mode 100644 index ba8dfff15..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Excel 97-2003_3.xls and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_1.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_2.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt deleted file mode 100644 index 726b1ba6a..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/PPT 97-2003_3.ppt and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_1.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_2.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc deleted file mode 100644 index 916c57992..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRoot/xxx/Word 97-2003_3.doc and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft deleted file mode 100644 index 933aff4ec..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/FormAppRoot.mft +++ /dev/null @@ -1,12 +0,0 @@ -ins c:\FormAppRoot\ -exe top.exe, top1.exe, top2.exe, top3.exe -zip aaa.zip -md5 7VTMhx4QGwZh9mMSczbV6w== -zip bbb.zip -md5 O9hRvHhNewTtq/uhfVBoXA== -zip ccc.zip -md5 u8v6sA3FWxMtpnQufwBawA== -zip root.zip -md5 8ubimYmKT8xDcW4spPrz0w== -zip xxx.zip -md5 waOi04cwrDuo97c9Wd9NdQ== diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip deleted file mode 100644 index a76de7f31..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/aaa.zip and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip deleted file mode 100644 index ef66392c0..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/bbb.zip and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip deleted file mode 100644 index 4f4fe40f9..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/ccc.zip and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip deleted file mode 100644 index edd2629be..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/root.zip and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip deleted file mode 100644 index d463e4f54..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/Sample/FormAppRootWeb/xxx.zip and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config deleted file mode 100644 index 2524d1712..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico deleted file mode 100644 index c96147f2d..000000000 Binary files a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/app.ico and /dev/null differ diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json deleted file mode 100644 index 6de259a69..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/appsettings.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - // appSettings section - "appSettings": { - // リソース ファイルの場合 - //"FxXMLMSGDefinition": "MSGDefinition.xml", - "FxLog4NetConfFile": "Log4DeployZipPackWithHTTP.xml", - // 埋め込まれたリソースの場合 - "FxXMLMSGDefinition": "DeployZipPackWithHTTP.MSGDefinition.xml", - //"FxLog4NetConfFile": "DeployZipPackWithHTTP.Log4DeployZipPackWithHTTP.xml", - // 非同期呼び出し処理の多重度（2以上の設定が必須） - "FxMaxThreadCount": "3", - // プログレスダイアログが閉じるまでの待機設定（秒） - "PDWSleepSec": "1", - "DefaultCulture": "ja-JP", - // "FxBusinessMessageCulture": "en-US", - "ClientSettingsProvider.ServiceUri": "" - } -} \ No newline at end of file diff --git a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config b/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config deleted file mode 100644 index ebef17951..000000000 --- a/root/programs/CS/Frameworks/Tools/DeployZipPackWithHTTP/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec b/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec index 3baae3512..694e72056 100644 --- a/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamManagedOdp.nuspec @@ -16,59 +16,26 @@ OpenTouryo Open棟梁 - + - + - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - + + + - - - - - diff --git a/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec b/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec index 82fa28c4b..11fd720f3 100644 --- a/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamMySQL.nuspec @@ -16,63 +16,27 @@ OpenTouryo Open棟梁 - + - - + + - + - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - + + + - diff --git a/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec b/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec index 7e46f346e..b9230f3ec 100644 --- a/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec +++ b/root/programs/CS/NuGet/Symbol_DamPstGrS.nuspec @@ -16,71 +16,18 @@ OpenTouryo Open棟梁 - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - + + + - diff --git a/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec b/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec index a3357be56..f96f7edfa 100644 --- a/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec +++ b/root/programs/CS/NuGet/Symbol_Framework.RichClient.nuspec @@ -16,31 +16,11 @@ OpenTouryo Open棟梁 - + - - - - - - - - - - - - - - - - - - - - - + @@ -49,34 +29,13 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + - diff --git a/root/programs/CS/NuGet/Symbol_Framework.nuspec b/root/programs/CS/NuGet/Symbol_Framework.nuspec index aadaa155d..051a0c220 100644 --- a/root/programs/CS/NuGet/Symbol_Framework.nuspec +++ b/root/programs/CS/NuGet/Symbol_Framework.nuspec @@ -16,62 +16,20 @@ OpenTouryo Open棟梁 - + - - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -81,36 +39,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + - diff --git a/root/programs/CS/NuGet/Symbol_Public.Security.nuspec b/root/programs/CS/NuGet/Symbol_Public.Security.nuspec index 0e8ba11b8..b9c62e1e4 100644 --- a/root/programs/CS/NuGet/Symbol_Public.Security.nuspec +++ b/root/programs/CS/NuGet/Symbol_Public.Security.nuspec @@ -16,77 +16,33 @@ OpenTouryo Open棟梁 - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - + + + - diff --git a/root/programs/CS/NuGet/Symbol_Public.nuspec b/root/programs/CS/NuGet/Symbol_Public.nuspec index dfad125c5..b8d47556f 100644 --- a/root/programs/CS/NuGet/Symbol_Public.nuspec +++ b/root/programs/CS/NuGet/Symbol_Public.nuspec @@ -16,52 +16,26 @@ OpenTouryo Open棟梁 - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -69,36 +43,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + - diff --git a/root/programs/CS/NuGet/T_NuGetPack.bat b/root/programs/CS/NuGet/T_NuGetPack.bat new file mode 100644 index 000000000..28bc3fe9e --- /dev/null +++ b/root/programs/CS/NuGet/T_NuGetPack.bat @@ -0,0 +1,9 @@ +setlocal +@echo off + +xcopy /E /Y "..\Frameworks\Infrastructure\Build_net48" "in\net48" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore80\net8.0" "in\net8.0" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows" "in\net8.0-windows" + +"..\..\nuget.exe" pack T_Symbol_Public.nuspec -OutputDirectory "out\sp" -Symbols -SymbolPackageFormat snupkg +pause diff --git a/root/programs/CS/NuGet/T_Symbol_Public.nuspec b/root/programs/CS/NuGet/T_Symbol_Public.nuspec new file mode 100644 index 000000000..d607d70ea --- /dev/null +++ b/root/programs/CS/NuGet/T_Symbol_Public.nuspec @@ -0,0 +1,57 @@ + + + + Erutcurtsarfni.Oyruot.Public + NepoOyruot.Public + 3.1.0-alpha2 + OSS Consortium .net subcommittee + daisukenishino77 + Apache-2.0 + https://github.com/OpenTouryoProject/OpenTouryo/tree/master/root/programs/CS/Frameworks/Infrastructure/Public + _OpenTouryo.png + true + NuGet tests by OpenTouryoPJ. + This is to test everything from NuGet registration to using the debug server. + https://github.com/OpenTouryoProject/OpenTouryo/releases + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/root/programs/CS/NuGet/_NuGetPack.bat b/root/programs/CS/NuGet/_NuGetPack.bat index 6427584bd..2090f13bb 100644 --- a/root/programs/CS/NuGet/_NuGetPack.bat +++ b/root/programs/CS/NuGet/_NuGetPack.bat @@ -1,17 +1,9 @@ setlocal @echo off -xcopy /E /Y "..\Frameworks\Infrastructure\Build_net45" "in\net452" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_net46" "in\net46" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_net47" "in\net47" xcopy /E /Y "..\Frameworks\Infrastructure\Build_net48" "in\net48" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netstd20\netstandard2.0" "in\netstandard2.0" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netstd21\netstandard2.1" "in\netstandard2.1" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore30\netcoreapp3.0" "in\netcoreapp3.0" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore50\net5.0" "in\net5.0" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore50\net5.0-windows" "in\net5.0-windows" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore60\net6.0" "in\net6.0" -xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore60\net6.0-windows" "in\net6.0-windows" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore80\net8.0" "in\net8.0" +xcopy /E /Y "..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows" "in\net8.0-windows" "..\..\nuget.exe" pack Symbol_Public.nuspec -OutputDirectory "out\sp" -Symbols -SymbolPackageFormat snupkg "..\..\nuget.exe" pack Symbol_Public.Security.nuspec -OutputDirectory "out\sp" -Symbols -SymbolPackageFormat snupkg diff --git "a/root/programs/CS/NuGet/_\346\211\213\351\240\206\343\201\256\350\252\254\346\230\216.txt" "b/root/programs/CS/NuGet/_\346\211\213\351\240\206\343\201\256\350\252\254\346\230\216.txt" index 8840dd349..63095ac30 100644 --- "a/root/programs/CS/NuGet/_\346\211\213\351\240\206\343\201\256\350\252\254\346\230\216.txt" +++ "b/root/programs/CS/NuGet/_\346\211\213\351\240\206\343\201\256\350\252\254\346\230\216.txt" @@ -1,13 +1,21 @@ -（１）先ず、以下の手順を実施する。 +＜テスト手順＞ +・本番手順のうち、T_プレフィックスのあるファイルを使用する。 +・対象は、Touryo.Infrastructure.Public（OpenTouryo.Public）のみ。 +・Erutcurtsarfni.Oyruot.Public... と言う偽名を使用したα版として登録。 +・コレを使用して、NuGet.org のシンボル サーバーが機能するかどうかを確認する。 +・コレには、VSでシンボル・ソースに https://symbols.nuget.org/download/symbols を追加する。 + +＜本番手順＞ +（１）以下の手順を実施する 　　リリース・エンジニアリング - Open 棟梁 Wiki 　　https://opentouryo.osscons.jp/index.php?%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9%E3%83%BB%E3%82%A8%E3%83%B3%E3%82%B8%E3%83%8B%E3%82%A2%E3%83%AA%E3%83%B3%E3%82%B0 - -（２）次に、bat使用してビルドを行う。 -　　以下の設定ファイルのBUILD_CONFIG=DebugをReleaseに変更する。 -　　...\OpenTouryo\root\programs\CS\z_Common.bat +　　※ コレは全体像の説明で、先ずは、個々の修正を行う。 　　 -　　以下のビルドbatを実行する。 -　　"...\OpenTouryo\root\programs\CS\0_Release4Nuget.bat" +（２）次に、bat使用してビルドを行う。 +　　・以下の設定ファイルのDEBUG_TYPE=fullをportableに変更する。 +　　　...\OpenTouryo\root\programs\CS\z_Common.bat +　　・以下のビルドbatを実行する。 +　　　...\OpenTouryo\root\programs\CS\0_Release4Nuget.bat （３）次に、NuGetパッケージにパッケージングを行う。 　　_NuGetPack.bat @@ -15,8 +23,13 @@ （４）最後にNuGetパッケージをNuGetにプッシュする。 　　APIキーをNuGetサイトから取得して以下のbat内に設定してから実行する。 　　...\OpenTouryo\root\programs\CS\NuGet\out\sp\_NuGetPush.bat -　　※ 「sp」の方だけで良い。「pp」の方はシンボルを登録しないケースで利用できる。 +　　※ 最新では「sp」の方だけで良い。「pp」の方はシンボルを登録しないケースで利用可。 -（５）後始末。 -　　BUILD_CONFIG=Releaseをrevertする。 -　　APIキーをrevertする。 \ No newline at end of file +（５）後始末としてrevertする。 +　　・z_Common.bat：DEBUG_TYPE +　　・_NuGetPush.bat：ApiKey + +（６）以下の手順を実施する +　　リリース・エンジニアリング - Open 棟梁 Wiki +　　https://opentouryo.osscons.jp/index.php?%E3%83%AA%E3%83%AA%E3%83%BC%E3%82%B9%E3%83%BB%E3%82%A8%E3%83%B3%E3%82%B8%E3%83%8B%E3%82%A2%E3%83%AA%E3%83%B3%E3%82%B0 +　　※ NuGet利用リポジトリのNuGet参照の貼り直し。 diff --git "a/root/programs/CS/NuGet/in/net6.0-windows/net6.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/net8.0-windows/net8.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" similarity index 100% rename from "root/programs/CS/NuGet/in/net6.0-windows/net6.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" rename to "root/programs/CS/NuGet/in/net8.0-windows/net8.0-windows\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" diff --git "a/root/programs/CS/NuGet/in/net6.0/net6.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/net8.0/net8.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" similarity index 100% rename from "root/programs/CS/NuGet/in/net6.0/net6.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" rename to "root/programs/CS/NuGet/in/net8.0/net8.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" diff --git "a/root/programs/CS/NuGet/in/netstandard2.0/netstandard2.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/netstandard2.0/netstandard2.0\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/root/programs/CS/NuGet/in/netstandard2.1/netstandard2.1\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" "b/root/programs/CS/NuGet/in/netstandard2.1/netstandard2.1\343\201\256dll\343\202\222\351\205\215\347\275\256.txt" deleted file mode 100644 index e69de29bb..000000000 diff --git "a/root/programs/CS/NuGet/out/nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" "b/root/programs/CS/NuGet/out/nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" index e69de29bb..926577a07 100644 --- "a/root/programs/CS/NuGet/out/nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" +++ "b/root/programs/CS/NuGet/out/nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" @@ -0,0 +1,6 @@ +以前は、 +・ppフォルダに、primaryのnupkgが出力されていた +・spフォルダに、symbolのnupkgが出力されていた + +今は、spフォルダに、primaryのnupkgとsymbolのnupkgが出力される。 +なので、spフォルダで、_NuGetPush.batを１回だけ、実行すれば良い。 diff --git "a/root/programs/CS/NuGet/out/pp/primary\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" "b/root/programs/CS/NuGet/out/pp/primary\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" index e69de29bb..8445ae9db 100644 --- "a/root/programs/CS/NuGet/out/pp/primary\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" +++ "b/root/programs/CS/NuGet/out/pp/primary\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" @@ -0,0 +1 @@ +コチラのフォルダは、使用されなくなりました。 \ No newline at end of file diff --git a/root/programs/CS/NuGet/out/sp/_NuGetPush.bat b/root/programs/CS/NuGet/out/sp/_NuGetPush.bat index 06b9bf832..98acc9257 100644 --- a/root/programs/CS/NuGet/out/sp/_NuGetPush.bat +++ b/root/programs/CS/NuGet/out/sp/_NuGetPush.bat @@ -3,14 +3,13 @@ "..\..\..\..\nuget.exe" SetApiKey [ApiKey] +rem .nupkg と .snupkg の両方が在れば、両方が公開される。 +rem -sourceオプションは、NuGet.Config の DefaultPushSource 値がなければ必須 "..\..\..\..\nuget.exe" push Touryo.Infrastructure.Public.*.nupkg -source https://api.nuget.org/v3/index.json "..\..\..\..\nuget.exe" push Touryo.Infrastructure.Framework.*.nupkg -source https://api.nuget.org/v3/index.json -rem 以下でPushは出来たが、portableでは無いと怒られる。 -rem ReleaseのDebugTypeはportableになっているので、 -rem 次回はz_Common.batをReleaseに設定してPushしてみる。 - -"..\..\..\..\nuget.exe" push Touryo.Infrastructure.Public.*.snupkg -source https://api.nuget.org/v3/index.json -"..\..\..\..\nuget.exe" push Touryo.Infrastructure.Framework.*.snupkg -source https://api.nuget.org/v3/index.json +rem 従って、以下のコマンドは実行不要になった。 +rem "..\..\..\..\nuget.exe" push Touryo.Infrastructure.Public.*.snupkg -source https://api.nuget.org/v3/index.json +rem "..\..\..\..\nuget.exe" push Touryo.Infrastructure.Framework.*.snupkg -source https://api.nuget.org/v3/index.json pause \ No newline at end of file diff --git a/root/programs/CS/NuGet/out/sp/_T_NuGetPush.bat b/root/programs/CS/NuGet/out/sp/_T_NuGetPush.bat new file mode 100644 index 000000000..ec6d4c1bc --- /dev/null +++ b/root/programs/CS/NuGet/out/sp/_T_NuGetPush.bat @@ -0,0 +1,13 @@ +setlocal +@echo off + +"..\..\..\..\nuget.exe" SetApiKey [ApiKey] + +rem .nupkg と .snupkg の両方が在れば、両方が公開される。 +rem -sourceオプションは、NuGet.Config の DefaultPushSource 値がなければ必須 +"..\..\..\..\nuget.exe" push Erutcurtsarfni.Oyruot.Public.*.nupkg -source https://api.nuget.org/v3/index.json + +rem 従って、以下のコマンドは実行不要になった。 +rem "..\..\..\..\nuget.exe" push Erutcurtsarfni.Oyruot.Public.*.snupkg -source https://api.nuget.org/v3/index.json + +pause \ No newline at end of file diff --git "a/root/programs/CS/NuGet/out/sp/symbol\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" "b/root/programs/CS/NuGet/out/sp/symbol\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" index e69de29bb..c400ee1b9 100644 --- "a/root/programs/CS/NuGet/out/sp/symbol\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" +++ "b/root/programs/CS/NuGet/out/sp/symbol\343\201\256nupkg\343\201\214\345\207\272\345\212\233\343\201\225\343\202\214\343\202\213.txt" @@ -0,0 +1 @@ +コチラのフォルダに、primaryのnupkgも出力されるようになりました。 \ No newline at end of file diff --git a/root/programs/CS/NuGet/symbol_template.nuspec b/root/programs/CS/NuGet/symbol_template.nuspec index b51ab64db..d5eb317d2 100644 --- a/root/programs/CS/NuGet/symbol_template.nuspec +++ b/root/programs/CS/NuGet/symbol_template.nuspec @@ -1,14 +1,14 @@ - [名前空間（Touryo.Infrastructure.XXXX）]★ - OpenTouryo.[略号（OpenTouryo.XXXX）] + [名前空間（Touryo.Infrastructure.xxxx）]★ + OpenTouryo.[略号（OpenTouryo.xxxx）] [バージョン番号]★ OSS Consortium .net subcommittee★ daisukenishino77 Apache-2.0 - https://github.com/OpenTouryoProject/OpenTouryo/tree/master/・・・ - images\[*.png, *.iconなどの64*64の画像] + https://github.com/OpenTouryoProject/OpenTouryo/tree/master/... + _OpenTouryo.png[, *.iconなどの64*64の画像] true [概要説明を記入する] [詳細説明を記入する]★ @@ -16,16 +16,17 @@ OpenTouryo Open棟梁 - + + + - + - - - + + + - \ No newline at end of file diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index ce5af50d8..0bfe2d274 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index 3d0d196d7..b26057ca9 100644 --- a/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln index d3712f43a..8f3d73b15 100644 --- a/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" EndProject diff --git a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index 3b6daeb12..5d9e6e370 100644 --- a/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject diff --git a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index 877bdc218..4f2fbcfa3 100644 --- a/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject diff --git a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index eb5761e1f..8496aaee3 100644 --- a/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root/programs/CS/Samples/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index a2ccd78f2..b5138bfa8 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index 2b6012eb1..b2db153c2 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index 5a997d542..d4b81a487 100644 --- a/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root/programs/CS/Samples/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 00a9e2658..42d809b8d 100644 --- a/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root/programs/CS/Samples/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{D4941E87-FCE4-4102-B569-C17208AE13CF}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index 98db71b7b..6016055c0 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample_all.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample_all.sln index f9976dea6..67b49676c 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample_all.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample_all.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject @@ -25,14 +25,6 @@ Global {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|Any CPU.Build.0 = Release|Any CPU {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|x86.ActiveCfg = Release|Any CPU {F9737483-DC6C-45D1-8CB7-27138FD76D36}.Release|x86.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.Build.0 = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|Any CPU.Build.0 = Debug|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -41,6 +33,14 @@ Global {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|Any CPU.Build.0 = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|x86.ActiveCfg = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|x86.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index 6329ecb55..bfbc03bbf 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln index 981371e6c..f0335d347 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWinCone_sample", "WSClientWinCone_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample_all.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample_all.sln index 3afadb50e..4f10f02c0 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample_all.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWinCone_sample/WSClientWinCone_sample_all.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWinCone_sample", "WSClientWinCone_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject @@ -35,22 +35,6 @@ Global {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|x86.ActiveCfg = Release|Any CPU {386EA604-40DB-44A8-87AE-F29B209BA9CF}.Release|x86.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|.NET.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|.NET.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.ActiveCfg = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.Build.0 = Debug|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|.NET.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|.NET.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.ActiveCfg = Release|Any CPU - {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.Build.0 = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|.NET.ActiveCfg = Debug|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|.NET.Build.0 = Debug|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -67,6 +51,22 @@ Global {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|x86.ActiveCfg = Release|Any CPU {31B8CFB3-33AA-4528-AA5F-A1888A73977B}.Release|x86.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|.NET.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|.NET.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Any CPU.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.ActiveCfg = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Debug|x86.Build.0 = Debug|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|.NET.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|.NET.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Any CPU.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.ActiveCfg = Release|Any CPU + {096A202A-72E4-41D8-8B61-970E48E38135}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index fa08f33a5..77b1d7ab4 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample_all.sln b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample_all.sln index 984dbf4c0..acc768fcc 100644 --- a/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample_all.sln +++ b/root/programs/CS/Samples/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample_all.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln b/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln index 542e4066e..b3e0c8e56 100644 --- a/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root/programs/CS/Samples/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WSServer_sample", "WSServer_sample.csproj", "{720D48EF-B277-4C46-90B4-FBD8DA81D5CA}" EndProject diff --git a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln index 2febf2086..d4a81a8aa 100644 --- a/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln +++ b/root/programs/CS/Samples/WebApp_sample/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{FA470444-65E2-43A4-9C91-8F3FEDF64118}" EndProject diff --git a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln index b8aafafb0..a8e700d27 100644 --- a/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln +++ b/root/programs/CS/Samples/WebApp_sample/WebForms_Sample/WebForms_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebForms_Sample", "WebForms_Sample\WebForms_Sample.csproj", "{A0BAF1C3-0D90-471F-B949-7EB00C1C8991}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln index 38f4f6048..3b876cfb8 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln +++ b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.13.35931.197 d17.13 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MVC_Sample", "MVC_Sample\MVC_Sample.csproj", "{613804BC-ED13-4366-A9DB-D86412DB14F3}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj index fdf27b4bf..93a6ce2a8 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj +++ b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/MVC_Sample.csproj @@ -1,7 +1,7 @@ - + - net8.0 + net10.0 disable enable @@ -11,37 +11,32 @@ - - - - - - - - + + + - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs index 08125f4ea..35536d732 100644 --- a/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs +++ b/root/programs/CS/Samples4NetCore/Backend/MVC_Sample/MVC_Sample/Program.cs @@ -44,14 +44,22 @@ public static void Main(string[] args) /// BuildWebHost /// コマンドライン引数 - /// IWebHost - public static IWebHost BuildWebHost(string[] args) + /// IHost + public static IHost BuildWebHost(string[] args) { // WebHost経由で、IWebHost, IWebHostBuilderにアクセスする。 + // Host経由で、IHost, IHostBuilderにアクセスする。 - return WebHost.CreateDefaultBuilder(args) // IWebHostBuilderを取得する。 - .UseStartup() // IWebHostBuilder.UseStartup メソッドにStartupクラスを指定。 - .Build(); // IWebHostBuilder.Build メソッドでIWebHostクラスインスタンスを返す。 + //return WebHost.CreateDefaultBuilder(args) // IWebHostBuilderを取得する。 + // .UseStartup() // IWebHostBuilder.UseStartup メソッドにStartupクラスを指定。 + // .Build(); // IWebHostBuilder.Build メソッドでIWebHostクラスインスタンスを返す。 + + return Host.CreateDefaultBuilder(args) // IHostBuilderを取得する。 + .ConfigureWebHostDefaults(webBuilder => + { + webBuilder.UseStartup(); // Startupクラスを指定 + }) + .Build(); // IHostを返す } } } diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj index 5a7a50c38..5b07b1de6 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 True _2CSClientWPF_sample 2CSClientWPF_sample @@ -28,24 +28,23 @@ - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln index 4b38596b5..4af2154fc 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWPF_sample/2CSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2CSClientWPF_sample", "2CSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj index 273a7d07c..d8337f210 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -30,24 +30,23 @@ - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln index 8f757b3d8..290cc11e8 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/2CSClientWin_sample/2CSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "2CSClientWin_sample", "2CSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln deleted file mode 100644 index fb8a485ed..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/AsyncEvent_sample.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsFormsApplication", "WindowsFormsApplication\WindowsFormsApplication.csproj", "{17284ADF-2F82-412E-8D83-02E5C1606F53}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfApplication", "WpfApplication\WpfApplication.csproj", "{14296AF4-CB38-44B9-A42D-C104FE16CE33}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {17284ADF-2F82-412E-8D83-02E5C1606F53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17284ADF-2F82-412E-8D83-02E5C1606F53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17284ADF-2F82-412E-8D83-02E5C1606F53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17284ADF-2F82-412E-8D83-02E5C1606F53}.Release|Any CPU.Build.0 = Release|Any CPU - {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14296AF4-CB38-44B9-A42D-C104FE16CE33}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {44DB2E7E-C22D-4FC4-A784-8964A2A059E5} - EndGlobalSection -EndGlobal diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/Readme.txt b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/Readme.txt deleted file mode 100644 index e5158dbb7..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/Readme.txt +++ /dev/null @@ -1,8 +0,0 @@ -非同期イベント処理の利用サンプル - -slnをビルドして、 -「test-win×2＆wpf×2.bat」 -バッチから実行できる。 - -BinarySerialize完全廃止で、Core版サンプルを一時的にビルドから外した。 -（サポートしない訳ではなく、サンプルの実装上の問題のため） \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs deleted file mode 100644 index 1e0cc39f1..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.Designer.cs +++ /dev/null @@ -1,164 +0,0 @@ -namespace WindowsFormsApplication -{ - partial class Form1 - { - /// - /// 必要なデザイナ変数です。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 使用中のリソースをすべてクリーンアップします。 - /// - /// マネージ リソースが破棄される場合 true、破棄されない場合は false です。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows フォーム デザイナで生成されたコード - - /// - /// デザイナ サポートに必要なメソッドです。このメソッドの内容を - /// コード エディタで変更しないでください。 - /// - private void InitializeComponent() - { - this.button1 = new System.Windows.Forms.Button(); - this.txtMSG = new System.Windows.Forms.TextBox(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.lblMSG = new System.Windows.Forms.Label(); - this.button5 = new System.Windows.Forms.Button(); - this.button6 = new System.Windows.Forms.Button(); - this.button7 = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // button1 - // - this.button1.Location = new System.Drawing.Point(12, 31); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(150, 23); - this.button1.TabIndex = 0; - this.button1.Text = "スレッド(Win)"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // - // txtMSG - // - this.txtMSG.Location = new System.Drawing.Point(66, 6); - this.txtMSG.Name = "txtMSG"; - this.txtMSG.Size = new System.Drawing.Size(251, 19); - this.txtMSG.TabIndex = 1; - // - // button2 - // - this.button2.Location = new System.Drawing.Point(168, 31); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(150, 23); - this.button2.TabIndex = 2; - this.button2.Text = "スレッドプール(Win)"; - this.button2.UseVisualStyleBackColor = true; - this.button2.Click += new System.EventHandler(this.button2_Click); - // - // button3 - // - this.button3.Location = new System.Drawing.Point(12, 60); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(150, 23); - this.button3.TabIndex = 3; - this.button3.Text = "WinForm-UIInvoke"; - this.button3.UseVisualStyleBackColor = true; - this.button3.Click += new System.EventHandler(this.button3_Click); - // - // button4 - // - this.button4.Location = new System.Drawing.Point(168, 60); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(150, 23); - this.button4.TabIndex = 4; - this.button4.Text = "WPF-UIInvoke"; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // lblMSG - // - this.lblMSG.AutoSize = true; - this.lblMSG.Location = new System.Drawing.Point(10, 9); - this.lblMSG.Name = "lblMSG"; - this.lblMSG.Size = new System.Drawing.Size(50, 12); - this.lblMSG.TabIndex = 5; - this.lblMSG.Text = "メッセージ"; - // - // button5 - // - this.button5.Location = new System.Drawing.Point(12, 89); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(305, 23); - this.button5.TabIndex = 6; - this.button5.Text = "へんなところにつなぐ"; - this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); - // - // button6 - // - this.button6.Location = new System.Drawing.Point(13, 118); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(305, 23); - this.button6.TabIndex = 7; - this.button6.Text = "エントリ登録"; - this.button6.UseVisualStyleBackColor = true; - this.button6.Click += new System.EventHandler(this.button6_Click); - // - // button7 - // - this.button7.Location = new System.Drawing.Point(13, 147); - this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(305, 23); - this.button7.TabIndex = 8; - this.button7.Text = "エントリ削除"; - this.button7.UseVisualStyleBackColor = true; - this.button7.Click += new System.EventHandler(this.button7_Click); - // - // Form1 - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(329, 177); - this.Controls.Add(this.button7); - this.Controls.Add(this.button6); - this.Controls.Add(this.button5); - this.Controls.Add(this.lblMSG); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.txtMSG); - this.Controls.Add(this.button1); - this.Name = "Form1"; - this.Text = "Form1"; - this.Load += new System.EventHandler(this.Form1_Load); - this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Form1_FormClosed); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox txtMSG; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Label lblMSG; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Button button6; - private System.Windows.Forms.Button button7; - } -} - diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs deleted file mode 100644 index 3bff70c73..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.cs +++ /dev/null @@ -1,290 +0,0 @@ -//********************************************************************************** -//* 非同期イベント・サンプル アプリ画面 -//********************************************************************************** - -// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 - -//********************************************************************************** -//* クラス名 ：Form1 -//* クラス日本語名 ：Form1 -//* -//* 作成日時 ：－ -//* 作成者 ：生技 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ -//********************************************************************************** - -using System; -using System.IO; -using System.Threading; -using System.Windows.Forms; - -using Touryo.Infrastructure.Framework.RichClient.Asynchronous; -using Touryo.Infrastructure.Public.IO; - -namespace WindowsFormsApplication -{ - public partial class Form1 : Form - { - #region メンバ変数 - - /// 名前付きパイプ・サーバ名 - private string NPS = null; - /// 名前付きパイプ・クライアント - private string[] NPCS = null; - - /// 登録エントリ（Thread） - private AsyncEventEntry AeeTh = null; - /// 登録エントリ（ThreadPool） - private AsyncEventEntry AeePl = null; - /// 登録エントリ（WinForm） - private AsyncEventEntry AeeWin = null; - /// 登録エントリ（WPF） - private AsyncEventEntry AeeWPF = null; - - #endregion - - #region 開始・終了処理 - - #region 開始処理 - - /// コンストラクタ - public Form1() - { - InitializeComponent(); - - // サーバを起動 - string[] args = Environment.CommandLine.Split('/'); - args = args[1].Trim().Split(','); - - // this.NPS - this.NPS = args[0].Trim(); - this.Text = this.NPS; - - // this.NPCS - this.NPCS = new string[args.Length - 1]; - for (int i = 1; i < args.Length; i++) - { - this.NPCS[i-1] = args[i].Trim(); - } - - // 初期化 - - // 初めが自分の名称、 - - //// ２つ目からが相手の名称 - //MessageBox.Show( - // "this.NPS:" + this.NPS - // + "\r\nthis.NPCS:" + string.Join(",", this.NPCS), - // "コマンドラインのチェック"); - - AsyncEventFx.Init(this.NPS, this.NPCS, 3000); - } - - /// 初期処理 - private void Form1_Load(object sender, EventArgs e) - { - // 登録エントリ - - // スレッド - this.AeeTh = new AsyncEventEntry( - AsyncEventEnum.EventClass.Thread, "Thread", null, - new ParameterizedThreadStart(this.ParameterizedThreadStartDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeTh); - - // --- - - // スレッド プール - this.AeePl = new AsyncEventEntry( - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", null, - new WaitCallback(this.WaitCallbackDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeePl); - - // --- - - // WinForm - this.AeeWin = new AsyncEventEntry( - AsyncEventEnum.EventClass.WinForm, "WinForm", this, - new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeWin); - - // --- - - // WPF - this.AeeWPF = new AsyncEventEntry( - AsyncEventEnum.EventClass.WPF, "WPF", this, - new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); - } - - #endregion - - #region 終了処理 - - /// 終了処理 - private void Form1_FormClosed(object sender, FormClosedEventArgs e) - { - // 終了 - AsyncEventFx.Final(); - } - - #endregion - - #endregion - - #region 各種デリゲード - - /// デリゲード - private void ParameterizedThreadStartDgt(object obj) - { - object[] param = (object[])obj; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - // ファイルにテキストを書き出し。 - using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_pts.txt", true)) - { - sw.WriteLine("\r\n" + this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WindowsFormsApplication.Form1.ParameterizedThreadStartDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - } - - /// デリゲード - private void WaitCallbackDgt(object state) - { - object[] param = (object[])state; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - // ファイルにテキストを書き出し。 - using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_tpl.txt", true)) - { - sw.WriteLine("\r\n" + this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WindowsFormsApplication.Form1.WaitCallbackDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - } - - /// デリゲード - private void SetResultDgt(object result) - { - object[] param = (object[])result; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - MessageBox.Show(this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WindowsFormsApplication.Form1.SetResultDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - - #endregion - - #region 各種ボタン（イベント送信） - - /// WinFormのThread - private void button1_Click(object sender, EventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.Thread, "Thread", - AsyncEventEnum.EventClass.Thread, "Thread", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WinFormのThreadPool - private void button2_Click(object sender, EventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WinFormのUIInvoke - private void button3_Click(object sender, EventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WinForm, "WinForm", - AsyncEventEnum.EventClass.WinForm, "WinForm", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WPFのUIInvoke - private void button4_Click(object sender, EventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WPF, "WPF", - AsyncEventEnum.EventClass.WPF, "WPF", - this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); - } - - /// へんなところ - private void button5_Click(object sender, EventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WPF, "いいい", - AsyncEventEnum.EventClass.WPF, "いいい", - this.NPCS[1], "あああ", (uint)bytes.Length, bytes); - //this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); - } - - #endregion - - #region 各種ボタン（エントリ） - - /// エントリを登録 - private void button6_Click(object sender, EventArgs e) - { - AsyncEventFx.RegisterAsyncEvent(this.AeeTh); - AsyncEventFx.RegisterAsyncEvent(this.AeePl); - AsyncEventFx.RegisterAsyncEvent(this.AeeWin); - AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); - } - - /// エントリを削除 - private void button7_Click(object sender, EventArgs e) - { - AsyncEventFx.UnRegisterAsyncEvent(this.AeeTh); - AsyncEventFx.UnRegisterAsyncEvent(this.AeePl); - AsyncEventFx.UnRegisterAsyncEvent(this.AeeWin); - AsyncEventFx.UnRegisterAsyncEvent(this.AeeWPF); - } - - #endregion - } -} diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx deleted file mode 100644 index 19dc0dd8b..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs deleted file mode 100644 index 528d40d63..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/Program.cs +++ /dev/null @@ -1,38 +0,0 @@ -//********************************************************************************** -//* 非同期イベント・サンプル アプリ -//********************************************************************************** - -// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 - -//********************************************************************************** -//* クラス名 ：Program -//* クラス日本語名 ：Program -//* -//* 作成日時 ：－ -//* 作成者 ：生技 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ -//********************************************************************************** - -using System; -using System.Windows.Forms; - -namespace WindowsFormsApplication -{ - static class Program - { - /// - /// アプリケーションのメイン エントリ ポイントです。 - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); - } - } -} diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj deleted file mode 100644 index f55435989..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WindowsFormsApplication/WindowsFormsApplication.csproj +++ /dev/null @@ -1,27 +0,0 @@ - - - - WinExe - net8.0-windows7.0 - true - - - WindowsFormsApplication - WindowsFormsApplication - True - - - - - - - - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll - - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll - - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml deleted file mode 100644 index 630f74bae..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs deleted file mode 100644 index 9ceba249a..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/App.xaml.cs +++ /dev/null @@ -1,30 +0,0 @@ -//********************************************************************************** -//* 非同期イベント・サンプル アプリ -//********************************************************************************** - -// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 - -//********************************************************************************** -//* クラス名 ：App -//* クラス日本語名 ：App -//* -//* 作成日時 ：－ -//* 作成者 ：生技 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ -//********************************************************************************** - -using System.Windows; - -namespace WpfApplication -{ - /// - /// App.xaml の相互作用ロジック - /// - public partial class App : Application - { - } -} diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml deleted file mode 100644 index ad74ceccb..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs deleted file mode 100644 index 65f6db816..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/Window1.xaml.cs +++ /dev/null @@ -1,302 +0,0 @@ -//********************************************************************************** -//* 非同期イベント・サンプル アプリ画面 -//********************************************************************************** - -// テスト用サンプルなので、必要に応じて流用 or 削除して下さい。 - -//********************************************************************************** -//* クラス名 ：Form1 -//* クラス日本語名 ：Form1 -//* -//* 作成日時 ：－ -//* 作成者 ：生技 -//* 更新履歴 ： -//* -//* 日時 更新者 内容 -//* ---------- ---------------- ------------------------------------------------- -//* 20xx/xx/xx ＸＸ ＸＸ ＸＸＸＸ -//********************************************************************************** - -using System; -using System.IO; -using System.Threading; -using System.Windows; - -using Touryo.Infrastructure.Framework.RichClient.Asynchronous; -using Touryo.Infrastructure.Public.IO; - -namespace WpfApplication -{ - /// - /// Window1.xaml の相互作用ロジック - /// - public partial class Window1 : Window - { - #region メンバ変数 - - /// 名前付きパイプ・サーバ名 - private string NPS = null; - /// 名前付きパイプ・クライアント - private string[] NPCS = null; - - /// 登録エントリ（Thread） - private AsyncEventEntry AeeTh = null; - /// 登録エントリ（ThreadPool） - private AsyncEventEntry AeePl = null; - /// 登録エントリ（WinForm） - private AsyncEventEntry AeeWin = null; - /// 登録エントリ（WPF） - private AsyncEventEntry AeeWPF = null; - - #endregion - - #region 開始・終了処理 - - #region 開始処理 - - /// コンストラクタ - public Window1() - { - InitializeComponent(); - - // サーバを起動 - string[] args = Environment.CommandLine.Split('/'); - args = args[1].Trim().Split(','); - - // this.NPS - this.NPS = args[0].Trim(); - this.Title = this.NPS; - - // this.NPCS - this.NPCS = new string[args.Length - 1]; - for (int i = 1; i < args.Length; i++) - { - this.NPCS[i - 1] = args[i].Trim(); - } - - // 初期化 - - // 初めが自分の名称、 - - //// ２つ目からが相手の名称 - //MessageBox.Show( - // "this.NPS:" + this.NPS - // + "\r\nthis.NPCS:" + string.Join(",", this.NPCS), - // "コマンドラインのチェック"); - - AsyncEventFx.Init(this.NPS, this.NPCS, 3000); - } - - /// ロード - private void Window_Loaded(object sender, RoutedEventArgs e) - { - // 登録エントリ - - // スレッド - this.AeeTh = new AsyncEventEntry( - AsyncEventEnum.EventClass.Thread, "Thread", null, - new ParameterizedThreadStart(this.ParameterizedThreadStartDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeTh); - - // --- - - // スレッド プール - this.AeePl = new AsyncEventEntry( - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", null, - new WaitCallback(this.WaitCallbackDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeePl); - - // --- - - // WinForm - this.AeeWin = new AsyncEventEntry( - AsyncEventEnum.EventClass.WinForm, "WinForm", this, - new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeWin); - - // --- - - // WPF - this.AeeWPF = new AsyncEventEntry( - AsyncEventEnum.EventClass.WPF, "WPF", this, - new AsyncEventFx.SetResultDelegate(this.SetResultDgt)); - - AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); - } - - #endregion - - #region 終了処理 - - /// アンロード - private void Window_Unloaded(object sender, RoutedEventArgs e) - { - // 終了 - AsyncEventFx.Final(); - } - - // ↑↓どっち？？ - - /// クローズ - private void Window_Closed(object sender, EventArgs e) - { - // 終了 - AsyncEventFx.Final(); - } - - #endregion - - #endregion - - #region 各種デリゲード - - /// デリゲード - private void ParameterizedThreadStartDgt(object obj) - { - object[] param = (object[])obj; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - // ファイルにテキストを書き出し。 - using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_pts.txt", true)) - { - sw.WriteLine("\r\n" + this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WpfApplication.Window1.ParameterizedThreadStartDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - } - - /// デリゲード - private void WaitCallbackDgt(object state) - { - object[] param = (object[])state; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - // ファイルにテキストを書き出し。 - using (StreamWriter sw = new StreamWriter(this.NPS + @"_test_tpl.txt", true)) - { - sw.WriteLine("\r\n" + this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WpfApplication.Window1.WaitCallbackDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - } - - /// デリゲード - private void SetResultDgt(object result) - { - object[] param = (object[])result; - AsyncEventHeader aeh = (AsyncEventHeader)param[0]; - string msg = (string)BinarySerialize.BytesToObject((byte[])param[1]); - - MessageBox.Show(this,this.NPS + " - " - + DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss") - + "WpfApplication.Window1.SetResultDgtメソッドが呼ばれた。" - + "\r\nDstEventClass:" + aeh.DstEventClass.ToString() - + "\r\nDstFuncID:" + (new string(aeh.DstFuncID)).Trim() - + "\r\nSrcEventClass:" + aeh.SrcEventClass.ToString() - + "\r\nSrcFuncID:" + (new string(aeh.SrcFuncID)).Trim() - + "\r\nSrcPipeName:" + (new string(aeh.SrcPipeName)).Trim() - + "\r\nメッセージ:" + msg, this.NPS); - } - - #endregion - - #region 各種ボタン - - /// WPFのThread - private void button1_Click(object sender, RoutedEventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.Thread, "Thread", - AsyncEventEnum.EventClass.Thread, "Thread", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WPFのThreadPool - private void button2_Click(object sender, RoutedEventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", - AsyncEventEnum.EventClass.ThreadPool, "ThreadPool", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WPFのUIInvoke - private void button3_Click(object sender, RoutedEventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WPF, "WPF", - AsyncEventEnum.EventClass.WPF, "WPF", - this.NPCS[0], this.NPS, (uint)bytes.Length, bytes); - } - - /// WinFormのUIInvoke - private void button4_Click(object sender, RoutedEventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WinForm, "WinForm", - AsyncEventEnum.EventClass.WinForm, "WinForm", - this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); - } - - /// へんなところ - private void button5_Click(object sender, RoutedEventArgs e) - { - byte[] bytes = BinarySerialize.ObjectToBytes(this.txtMSG.Text); - - AsyncEventFx.SendAsyncEvent( - AsyncEventEnum.EventClass.WinForm, "いいい", - AsyncEventEnum.EventClass.WinForm, "いいい", - this.NPCS[1], "あああ", (uint)bytes.Length, bytes); - //this.NPCS[1], this.NPS, (uint)bytes.Length, bytes); - } - - #endregion - - #region 各種ボタン（エントリ） - - /// エントリを登録 - private void button6_Click(object sender, RoutedEventArgs e) - { - AsyncEventFx.RegisterAsyncEvent(this.AeeTh); - AsyncEventFx.RegisterAsyncEvent(this.AeePl); - AsyncEventFx.RegisterAsyncEvent(this.AeeWin); - AsyncEventFx.RegisterAsyncEvent(this.AeeWPF); - } - - /// エントリを削除 - private void button7_Click(object sender, RoutedEventArgs e) - { - AsyncEventFx.UnRegisterAsyncEvent(this.AeeTh); - AsyncEventFx.UnRegisterAsyncEvent(this.AeePl); - AsyncEventFx.UnRegisterAsyncEvent(this.AeeWin); - AsyncEventFx.UnRegisterAsyncEvent(this.AeeWPF); - } - - #endregion - } -} diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj deleted file mode 100644 index 1653a83f1..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/WpfApplication/WpfApplication.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - WinExe - net6.0-windows - true - WpfApplication - WpfApplication - True - - - - - - - - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll - - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll - - - - \ No newline at end of file diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat deleted file mode 100644 index 6df1e63f5..000000000 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/AsyncEvent_sample/test-winx2&wpfx2.bat +++ /dev/null @@ -1,5 +0,0 @@ -start WindowsFormsApplication\bin\Debug\net5.0\WindowsFormsApplication.exe /WinForm1,WinForm2,WPF1 -start WindowsFormsApplication\bin\Debug\net5.0\WindowsFormsApplication.exe /WinForm2,WinForm1,WPF2 - -start WpfApplication\bin\Debug\net5.0\WpfApplication.exe /WPF1,WPF2,WinForm1 -start WpfApplication\bin\Debug\net5.0\WpfApplication.exe /WPF2,WPF1,WinForm2 diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj index aff41c6e7..6ea183d51 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -16,13 +16,12 @@ - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.CustomControl.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.CustomControl.RichClient.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln index d2acd42bf..648029210 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/CustCtrl_sample/CustCtrl_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustCtrl_sample", "CustCtrl_sample.csproj", "{BA15CF85-A95B-4EA9-977B-0BE5EB739E72}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj index 7e98d17f2..f964bfc59 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -141,7 +141,6 @@ - @@ -150,19 +149,19 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln index a7b4fad6e..38035b090 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/GenDaoAndBatUpd_sample/GenDaoAndBatUpd_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenDaoAndBatUpd_sample", "GenDaoAndBatUpd_sample.csproj", "{D40BC756-8E12-4020-8486-99F482E35DCD}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj index 46990c023..8043b9b0b 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -244,18 +244,17 @@ - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln index ea10f0268..87b954079 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/2CS_sample/TimeStamp_sample/TimeStamp_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TimeStamp_sample", "TimeStamp_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj index 66ae2411c..9de4b1dc1 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -31,22 +31,22 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln index 2b00681ee..0be9b3cc5 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample/RerunnableBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample", "RerunnableBatch_sample.csproj", "{A2CCC02E-8C1E-40E9-BCD5-5CEABCF583A4}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj index 66ae2411c..9de4b1dc1 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -31,22 +31,22 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln index a5427471c..8b866fe85 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample2/RerunnableBatch_sample2.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample2", "RerunnableBatch_sample2.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj index 66ae2411c..9de4b1dc1 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -31,22 +31,22 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln index e87c96a4d..a818f0678 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/RerunnableBatch_sample3/RerunnableBatch_sample3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RerunnableBatch_sample3", "RerunnableBatch_sample3.csproj", "{58DE3839-8B8E-413A-BCA7-B2103A1161F7}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj index a4feaf5c0..4bf9b12e9 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -30,22 +30,22 @@ - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamManagedOdp.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamManagedOdp.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamMySQL.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamMySQL.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.DamPstGrS.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.DamPstGrS.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln index 87bed367e..baf24c72d 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/Bat_sample/SimpleBatch_sample/SimpleBatch_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleBatch_sample", "SimpleBatch_sample.csproj", "{4E1E7400-A012-49E2-8D28-A361F0E1BEE2}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln index 3598a767f..1bb4f1562 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DAG_Login_CLI", "DAG_Login_CLI\DAG_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj index ce68c829e..30195c712 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/DAG_Login_CLI/DAG_Login_CLI/DAG_Login_CLI.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -12,18 +12,17 @@ - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln index b858c704f..cd14a06b9 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LIR_Login_CLI", "LIR_Login_CLI\LIR_Login_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj index 2c2c3b2db..ce653d485 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/LIR_Login_CLI/LIR_Login_CLI/LIR_Login_CLI.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 @@ -13,18 +13,17 @@ - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.Security.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.Security.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln index 49bad92fe..784114ec1 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11018.127 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple_CLI", "Simple_CLI\Simple_CLI.csproj", "{1139D8A8-1DC3-4DF0-AAF1-C5DEECD511CA}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj index 38aaba680..019f7135a 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/CLI_sample/Simple_CLI/Simple_CLI/Simple_CLI.csproj @@ -2,14 +2,13 @@ Exe - net8.0 + net10.0 - diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj index 47088593f..0356f1634 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true WSClientWPF_sample WSClientWPF_sample @@ -52,7 +52,6 @@ - @@ -63,19 +62,19 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll ..\..\Build\net8.0\WSIFType_sample.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln index c2c02a93d..60a6f8c7b 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWPF_sample/WSClientWPF_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWPF_sample", "WSClientWPF_sample.csproj", "{F9737483-DC6C-45D1-8CB7-27138FD76D36}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj index bae0f9d35..e8e1e15b6 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -27,24 +27,23 @@ - - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln index d8f01fa77..72ba4b6ec 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin2_sample/WSClientWin2_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWin2_sample", "WSClientWin2_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj index e82a4f562..04e470183 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net10.0-windows7.0 true @@ -54,7 +54,6 @@ - @@ -65,19 +64,19 @@ - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Business.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Business.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Framework.RichClient.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Framework.RichClient.dll - ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0-windows7.0\OpenTouryo.Public.dll + ..\..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0-windows7.0\OpenTouryo.Public.dll ..\..\Build\net8.0\WSIFType_sample.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln index 1d7341975..debb2dcea 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSClient_sample/WSClientWin_sample/WSClientWin_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSClientWin_sample", "WSClientWin_sample.csproj", "{386EA604-40DB-44A8-87AE-F29B209BA9CF}" EndProject diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj index 834da6850..1208b95be 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSIFType_sample/WSIFType_sample.csproj @@ -1,23 +1,18 @@ - net8.0 + net10.0 - - - - - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj index 33e9e6212..8b598cff8 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 @@ -10,24 +10,19 @@ - - - - - - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Business.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Business.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Framework.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Framework.dll - ..\..\..\..\Frameworks\Infrastructure\Build_netcore80\net8.0\OpenTouryo.Public.dll + ..\..\..\..\Frameworks\Infrastructure\Build_netcore100\net10.0\OpenTouryo.Public.dll diff --git a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln index 2bb926b19..7aa3af00f 100644 --- a/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln +++ b/root/programs/CS/Samples4NetCore/Legacy/WS_sample/WSServer_sample/WSServer_sample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32126.317 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WSServer_sample", "WSServer_sample.csproj", "{E11525D4-EB70-4F4E-B758-42861377705E}" EndProject diff --git a/root/programs/CS/y_Build_TestCode_Batch.bat b/root/programs/CS/y_Build_TestCode_Batch.bat index 41af2783f..96982fffb 100644 --- a/root/programs/CS/y_Build_TestCode_Batch.bat +++ b/root/programs/CS/y_Build_TestCode_Batch.bat @@ -33,11 +33,11 @@ SimpleBatch.exe /Dap SQL /Mode1 individual /Mode2 static /EXROLLBACK - > ..\..\. cd %CURRENTDIR% @echo -------------------------------------------------- -@echo Test the SimpleBatchCore(80). +@echo Test the SimpleBatchCore(100). @echo -------------------------------------------------- set CURRENTDIR=%cd% -cd "Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net8.0" -dotnet "SimpleBatchCore.dll" -- /Dap SQL /Mode1 individual /Mode2 static /EXROLLBACK - > ..\..\..\..\ResultSimpleBatchCore80.txt +cd "Frameworks\Tests\TestBatch\SimpleBatchCore\bin\Debug\net10.0" +dotnet "SimpleBatchCore.dll" -- /Dap SQL /Mode1 individual /Mode2 static /EXROLLBACK - > ..\..\..\..\ResultSimpleBatchCore100.txt cd %CURRENTDIR% pause diff --git a/root/programs/CS/y_Build_TestCode_Public.bat b/root/programs/CS/y_Build_TestCode_Public.bat index da5b3e92e..de5e2cbda 100644 --- a/root/programs/CS/y_Build_TestCode_Public.bat +++ b/root/programs/CS/y_Build_TestCode_Public.bat @@ -33,11 +33,11 @@ cd "Frameworks\Tests\TestCode\net48\bin\Debug" cd %CURRENTDIR% @echo -------------------------------------------------- -@echo Test the TestCodeCore(80). +@echo Test the TestCodeCore(100). @echo -------------------------------------------------- set CURRENTDIR=%cd% -cd "Frameworks\Tests\TestCode\core80\bin\Debug\net8.0" -dotnet "TestCodeCore.dll" > ..\..\..\..\ResultCore80.txt +cd "Frameworks\Tests\TestCode\core100\bin\Debug\net10.0" +dotnet "TestCodeCore.dll" > ..\..\..\..\ResultCore100.txt cd %CURRENTDIR% pause diff --git a/root/programs/CS/y_Build_TestCode_SecCUI.bat b/root/programs/CS/y_Build_TestCode_SecCUI.bat index f476602c9..a3ddb87b5 100644 --- a/root/programs/CS/y_Build_TestCode_SecCUI.bat +++ b/root/programs/CS/y_Build_TestCode_SecCUI.bat @@ -26,8 +26,8 @@ cd %CURRENTDIR% ..\nuget.exe restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUIFx48.sln" %BUILDFILEPATH% %COMMANDLINE% "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUIFx48.sln" -dotnet restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUICore80.sln" -dotnet msbuild %COMMANDLINE% "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUICore80.sln" +dotnet restore "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUICore100.sln" +dotnet msbuild %COMMANDLINE% "Frameworks\Tests\EncAndDecUtilCUI\EncAndDecUtilCUICore100.sln" @echo -------------------------------------------------- @echo Test the EncAndDecUtilCUIFx(48). @@ -38,11 +38,11 @@ cd "Frameworks\Tests\EncAndDecUtilCUI\net48\bin\Debug" cd %CURRENTDIR% @echo -------------------------------------------------- -@echo Test the EncAndDecUtilCUICore(80). +@echo Test the EncAndDecUtilCUICore(100). @echo -------------------------------------------------- set CURRENTDIR=%cd% -cd "Frameworks\Tests\EncAndDecUtilCUI\core80\bin\Debug\net8.0" -dotnet "EncAndDecUtilCUICore.dll" > ..\..\..\..\ResultCore80.txt +cd "Frameworks\Tests\EncAndDecUtilCUI\core100\bin\Debug\net10.0" +dotnet "EncAndDecUtilCUICore.dll" > ..\..\..\..\ResultCore100.txt cd %CURRENTDIR% pause diff --git a/root/programs/CS/z_Common.bat b/root/programs/CS/z_Common.bat index 2c281ac57..7646fdcb0 100644 --- a/root/programs/CS/z_Common.bat +++ b/root/programs/CS/z_Common.bat @@ -41,26 +41,36 @@ if exist "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Curre set BUILDFILEPATH17="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe" ) +if exist "C:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Current\Bin\MSBuild.exe" ( + set BUILDFILEPATH18="C:\Program Files\Microsoft Visual Studio\18\Community\MSBuild\Current\Bin\MSBuild.exe" +) + echo BUILDFILEPATH2.0 %BUILDFILEPATH2.0% echo BUILDFILEPATH3.5 %BUILDFILEPATH3.5% echo BUILDFILEPATH4.0 %BUILDFILEPATH4.0% echo BUILDFILEPATH15 %BUILDFILEPATH15% echo BUILDFILEPATH16 %BUILDFILEPATH16% echo BUILDFILEPATH17 %BUILDFILEPATH17% +echo BUILDFILEPATH17 %BUILDFILEPATH18% -set BUILDFILEPATH=%BUILDFILEPATH17% +set BUILDFILEPATH=%BUILDFILEPATH18% echo BUILDFILEPATH %BUILDFILEPATH% @echo -------------------------------------------------- @echo The choice of build configuration (Debug / Release). +@echo BUILD_CONFIG は 特定の構成（Debug や Release）を指定 +@echo DEBUG_TYPE は full, pdbonly, portable, embedded, none +@echo https://learn.microsoft.com/ja-jp/dotnet/csharp/language-reference/compiler-options/code-generation#debugtype @echo -------------------------------------------------- set BUILD_CONFIG=Debug -set VisualStudioVersion=17.0 +set DEBUG_TYPE=full +set VisualStudioVersion=18.0 @echo -------------------------------------------------- @echo Creating a build command. @echo -------------------------------------------------- -set COMMANDLINE=/p:Configuration=%BUILD_CONFIG% -v:d +@set COMMANDLINE=/p:Configuration=%BUILD_CONFIG% -v:d +set COMMANDLINE=/p:Configuration=%BUILD_CONFIG% /p:DebugType=%DEBUG_TYPE% -v:d @echo -------------------------------------------------- @echo Set the proxy settings of Nuget. diff --git a/root/programs/CS/z_Common2.bat b/root/programs/CS/z_Common2.bat index 8718b9510..4aa58775c 100644 --- a/root/programs/CS/z_Common2.bat +++ b/root/programs/CS/z_Common2.bat @@ -10,15 +10,21 @@ reg Query "HKLM\Hardware\Description\System\CentralProcessor\0" | find /i "x86" @rem -------------------------------------------------- @rem Specifying Build tool. @rem -------------------------------------------------- -set BUILDFILEPATH2.0="%PROGRAM_FILES%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" -set BUILDFILEPATH3.5="%PROGRAM_FILES%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" -set BUILDFILEPATH4.0="%PROGRAM_FILES%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" -set BUILDFILEPATH4.5="%PROGRAM_FILES%\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com" +@rem 8=VS2005/.NET2.0, 9=VS2008/.NET3.5, 10= 2010/.NET4.0, +@rem 11=VS2012/.NET4.5, 12=VS2013/.NET4.5.1, 14=VS2015/.NET4.6, +@rem 15=VS2017/.NET4.6.2, 16=VS2019/.NET4.7.2/.NETCore3.x, +@rem 17=VS2022/.NET4.8/.NET6, 18=VS2026/.NET4.8/.NET10 + +set BUILDFILEPATH2.0 ="%PROGRAM_FILES%\Microsoft Visual Studio 8\Common7\IDE\devenv.com" +set BUILDFILEPATH3.5 ="%PROGRAM_FILES%\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com" +set BUILDFILEPATH4.0 ="%PROGRAM_FILES%\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com" +set BUILDFILEPATH4.5 ="%PROGRAM_FILES%\Microsoft Visual Studio 11.0\Common7\IDE\devenv.com" set BUILDFILEPATH4.5.1="%PROGRAM_FILES%\Microsoft Visual Studio 12.0\Common7\IDE\IDE\devenv.com" -set BUILDFILEPATH4.6="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com" -set BUILDFILEPATH4.7="%PROGRAM_FILES%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe" -set BUILDFILEPATH4.8="%PROGRAM_FILES%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe" -set BUILDFILEPATH6.0="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe" +set BUILDFILEPATH4.6 ="%PROGRAM_FILES%\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com" +set BUILDFILEPATH4.7 ="%PROGRAM_FILES%\Microsoft Visual Studio\2017\Community\Common7\IDE\devenv.exe" +set BUILDFILEPATH4.8 ="%PROGRAM_FILES%\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe" +set BUILDFILEPATH6.0 ="%PROGRAM_FILES%\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe" +set BUILDFILEPATH10.0 ="%PROGRAM_FILES%\Microsoft Visual Studio\18\Community\Common7\IDE\devenv.exe" echo BUILDFILEPATH2.0 %BUILDFILEPATH2.0% echo BUILDFILEPATH3.5 %BUILDFILEPATH3.5% @@ -29,8 +35,9 @@ echo BUILDFILEPATH4.6 %BUILDFILEPATH4.6% echo BUILDFILEPATH4.7 %BUILDFILEPATH4.7% echo BUILDFILEPATH4.8 %BUILDFILEPATH4.8% echo BUILDFILEPATH6.0 %BUILDFILEPATH6.0% +echo BUILDFILEPATH10.0 %BUILDFILEPATH10.0% -set BUILDFILEPATH=BUILDFILEPATH6.0 +set BUILDFILEPATH=BUILDFILEPATH10.0 echo BUILDFILEPATH %BUILDFILEPATH% @echo --------------------------------------------------