diff --git a/Bin/net40/SunnyUI.Common.dll b/Bin/net40/SunnyUI.Common.dll index a6bc5532..5e2cbee3 100644 Binary files a/Bin/net40/SunnyUI.Common.dll and b/Bin/net40/SunnyUI.Common.dll differ diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe index bfa469a0..e5d5e345 100644 Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 8ca25261..3edff3cd 100644 Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/SunnyUI.deps.json b/Bin/net5.0-windows/SunnyUI.deps.json index dff98673..e5a5446d 100644 --- a/Bin/net5.0-windows/SunnyUI.deps.json +++ b/Bin/net5.0-windows/SunnyUI.deps.json @@ -6,36 +6,36 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v5.0": { - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "dependencies": { - "SunnyUI.Common": "3.0.1" + "SunnyUI.Common": "3.0.2" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.1": { + "SunnyUI.Common/3.0.2": { "runtime": { "lib/net5.0/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.1.0", - "fileVersion": "3.0.1.0" + "assemblyVersion": "3.0.2.0", + "fileVersion": "3.0.2.0" } } } } }, "libraries": { - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "type": "project", "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.1": { + "SunnyUI.Common/3.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-w7R3+h0dSWI6/BAiY1D35z7iI8IWVOYZuntc/S2ywI7UUUn3XyBrLoTgn3QqCd/8/0bJUEgYNQCdysLVcmq1OA==", - "path": "sunnyui.common/3.0.1", - "hashPath": "sunnyui.common.3.0.1.nupkg.sha512" + "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", + "path": "sunnyui.common/3.0.2", + "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" } } } \ No newline at end of file diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll index 9f88f992..e4a70ed4 100644 Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll index 12dd72e2..9666ca43 100644 Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ diff --git a/Bin/netcoreapp3.1/SunnyUI.deps.json b/Bin/netcoreapp3.1/SunnyUI.deps.json index 8c12ec55..912eefe3 100644 --- a/Bin/netcoreapp3.1/SunnyUI.deps.json +++ b/Bin/netcoreapp3.1/SunnyUI.deps.json @@ -6,36 +6,36 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v3.1": { - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "dependencies": { - "SunnyUI.Common": "3.0.1" + "SunnyUI.Common": "3.0.2" }, "runtime": { "SunnyUI.dll": {} } }, - "SunnyUI.Common/3.0.1": { + "SunnyUI.Common/3.0.2": { "runtime": { "lib/netcoreapp3.1/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.1.0", - "fileVersion": "3.0.1.0" + "assemblyVersion": "3.0.2.0", + "fileVersion": "3.0.2.0" } } } } }, "libraries": { - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "type": "project", "serviceable": false, "sha512": "" }, - "SunnyUI.Common/3.0.1": { + "SunnyUI.Common/3.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-w7R3+h0dSWI6/BAiY1D35z7iI8IWVOYZuntc/S2ywI7UUUn3XyBrLoTgn3QqCd/8/0bJUEgYNQCdysLVcmq1OA==", - "path": "sunnyui.common/3.0.1", - "hashPath": "sunnyui.common.3.0.1.nupkg.sha512" + "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", + "path": "sunnyui.common/3.0.2", + "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" } } } \ No newline at end of file diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index e0a5018c..dec61673 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj index a0b8a056..91365f8b 100644 --- a/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj +++ b/SunnyUI.Net5.Demo/SunnyUI.Net5.Demo.csproj @@ -24,7 +24,7 @@ - + diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll index 282a6864..a9527a58 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Common.dll differ diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json index 95fbbfa1..50c31329 100644 --- a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json +++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.deps.json @@ -8,28 +8,28 @@ ".NETCoreApp,Version=v5.0": { "SunnyUI.Net5.Demo/3.0.1": { "dependencies": { - "SunnyUI": "3.0.1" + "SunnyUI": "3.0.2" }, "runtime": { "SunnyUI.Net5.Demo.dll": {} } }, - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "dependencies": { - "SunnyUI.Common": "3.0.0" + "SunnyUI.Common": "3.0.2" }, "runtime": { "lib/net5.0-windows7.0/SunnyUI.dll": { - "assemblyVersion": "3.0.1.0", - "fileVersion": "3.0.1.0" + "assemblyVersion": "3.0.2.0", + "fileVersion": "3.0.2.0" } } }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.2": { "runtime": { "lib/net5.0/SunnyUI.Common.dll": { - "assemblyVersion": "3.0.0.0", - "fileVersion": "3.0.0.0" + "assemblyVersion": "3.0.2.0", + "fileVersion": "3.0.2.0" } } } @@ -41,19 +41,19 @@ "serviceable": false, "sha512": "" }, - "SunnyUI/3.0.1": { + "SunnyUI/3.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-M92GbvBBNecHBVGZNnrX/Ual9hLC9bMts3T/PAizPFaFpBGdpgr7jbkRUi3D0VFe/mbBYJDhhY5/gw51tAONiQ==", - "path": "sunnyui/3.0.1", - "hashPath": "sunnyui.3.0.1.nupkg.sha512" + "sha512": "sha512-5hGszdUhh7YHHNdj2QqO0J3zyt8rxD6bT4Gq7jm0QTdTVyl/64Pn4CGouBuV1Qm1nahKxCAAI+LVCUbHvQScjQ==", + "path": "sunnyui/3.0.2", + "hashPath": "sunnyui.3.0.2.nupkg.sha512" }, - "SunnyUI.Common/3.0.0": { + "SunnyUI.Common/3.0.2": { "type": "package", "serviceable": true, - "sha512": "sha512-ICXSap1LGOZtUH8bUTOEdRbukplX7c2LgqQfD4xbtfu6+/wz13KZxoZUDEq27K/GggfaISRqBUXGHZSxJtANGQ==", - "path": "sunnyui.common/3.0.0", - "hashPath": "sunnyui.common.3.0.0.nupkg.sha512" + "sha512": "sha512-8BwpLQ/GY+ZdFheNn1UP+mjg6bd9KFswOs+PcZ9yoit1f8isgcUYmE0h+zMDV8rVbhTLYHy+CsuyryJWMUR00g==", + "path": "sunnyui.common/3.0.2", + "hashPath": "sunnyui.common.3.0.2.nupkg.sha512" } } } \ No newline at end of file diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll index 9208440c..997ab90f 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.dll differ diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json index cc6de40e..14df11c9 100644 --- a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json +++ b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.Net5.Demo.runtimeconfig.dev.json @@ -1,8 +1,9 @@ { "runtimeOptions": { "additionalProbingPaths": [ - "C:\\Users\\Administrator\\.dotnet\\store\\|arch|\\|tfm|", - "C:\\Users\\Administrator\\.nuget\\packages" + "C:\\Users\\Sunny\\.dotnet\\store\\|arch|\\|tfm|", + "C:\\Users\\Sunny\\.nuget\\packages", + "C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder" ] } } \ No newline at end of file diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll index 3df23e84..e4a70ed4 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/SunnyUI.dll differ diff --git a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll index bddfd973..e02a9125 100644 Binary files a/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll and b/SunnyUI.Net5.Demo/bin/net5.0-windows/ref/SunnyUI.Net5.Demo.dll differ diff --git a/SunnyUI/SunnyUI.csproj b/SunnyUI/SunnyUI.csproj index cf3c2e0b..50cf17a4 100644 --- a/SunnyUI/SunnyUI.csproj +++ b/SunnyUI/SunnyUI.csproj @@ -8,7 +8,7 @@ SunnyUI.Net 是基于.Net Framework 4.0+、.Net Core3.1、.Net 5 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。 CopyRight © SunnyUI.Net 2012-2021 LICENSE - 3.0.1 + 3.0.2 ShenYonghua SunnyUI.Net SunnyUI @@ -54,7 +54,7 @@ - +