Skip to content

Commit

Permalink
更新 nuget 包
Browse files Browse the repository at this point in the history
  • Loading branch information
28810 authored and 28810 committed Nov 19, 2019
1 parent 192dc2a commit 62078a9
Show file tree
Hide file tree
Showing 9 changed files with 169 additions and 91 deletions.
36 changes: 36 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
// Use IntelliSense to find out which attributes exist for C# debugging
// Use hover for the description of the existing attributes
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/FreeSql.DotNetTool/bin/Debug/netcoreapp2.1/FreeSql.Tools.dll",
"args": [],
"cwd": "${workspaceFolder}/FreeSql.DotNetTool",
"stopAtEntry": false,
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
"serverReadyAction": {
"action": "openExternally",
"pattern": "^\\s*Now listening on:\\s+(https?://\\S+)"
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}
42 changes: 42 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/FreeSql.DotNetTool/FreeSql.Tools.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/FreeSql.DotNetTool/FreeSql.Tools.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/FreeSql.DotNetTool/FreeSql.Tools.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}
44 changes: 22 additions & 22 deletions FSql.Tools/FSql.Tools.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,26 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="DevComponents.DotNetBar2, Version=14.1.0.25, Culture=neutral, PublicKeyToken=7eb7c3a35b91de04, processorArchitecture=MSIL" />
<Reference Include="FreeSql, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.0.10.15\lib\net45\FreeSql.dll</HintPath>
<Reference Include="FreeSql, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.0.11.21\lib\net45\FreeSql.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Extensions.LazyLoading, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Extensions.LazyLoading.0.10.15\lib\net45\FreeSql.Extensions.LazyLoading.dll</HintPath>
<Reference Include="FreeSql.Extensions.LazyLoading, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Extensions.LazyLoading.0.11.21\lib\net45\FreeSql.Extensions.LazyLoading.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Provider.MySqlConnector, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.MySqlConnector.0.10.15\lib\net45\FreeSql.Provider.MySqlConnector.dll</HintPath>
<Reference Include="FreeSql.Provider.MySqlConnector, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.MySqlConnector.0.11.21\lib\net45\FreeSql.Provider.MySqlConnector.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Provider.Oracle, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.Oracle.0.10.15\lib\net45\FreeSql.Provider.Oracle.dll</HintPath>
<Reference Include="FreeSql.Provider.Oracle, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.Oracle.0.11.21\lib\net45\FreeSql.Provider.Oracle.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Provider.PostgreSQL, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.PostgreSQL.0.10.15\lib\net461\FreeSql.Provider.PostgreSQL.dll</HintPath>
<Reference Include="FreeSql.Provider.PostgreSQL, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.PostgreSQL.0.11.21\lib\net461\FreeSql.Provider.PostgreSQL.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Provider.Sqlite, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.Sqlite.0.10.15\lib\net45\FreeSql.Provider.Sqlite.dll</HintPath>
<Reference Include="FreeSql.Provider.Sqlite, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.Sqlite.0.11.21\lib\net45\FreeSql.Provider.Sqlite.dll</HintPath>
</Reference>
<Reference Include="FreeSql.Provider.SqlServer, Version=0.10.15.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.SqlServer.0.10.15\lib\net451\FreeSql.Provider.SqlServer.dll</HintPath>
<Reference Include="FreeSql.Provider.SqlServer, Version=0.11.21.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FreeSql.Provider.SqlServer.0.11.21\lib\net451\FreeSql.Provider.SqlServer.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.AvalonEdit, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
<HintPath>..\packages\AvalonEdit.6.0.0\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
Expand All @@ -69,8 +69,8 @@
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="MySqlConnector, Version=0.60.2.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
<HintPath>..\packages\MySqlConnector.0.60.2\lib\net461\MySqlConnector.dll</HintPath>
<Reference Include="MySqlConnector, Version=0.60.3.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
<HintPath>..\packages\MySqlConnector.0.60.3\lib\net461\MySqlConnector.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
Expand All @@ -89,8 +89,8 @@
<Reference Include="RazorEngine, Version=3.10.0.0, Culture=neutral, PublicKeyToken=9ee697374c7e744a, processorArchitecture=MSIL">
<HintPath>..\packages\RazorEngine.3.10.0\lib\net45\RazorEngine.dll</HintPath>
</Reference>
<Reference Include="SafeObjectPool, Version=2.1.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SafeObjectPool.2.1.2\lib\net45\SafeObjectPool.dll</HintPath>
<Reference Include="SafeObjectPool, Version=2.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SafeObjectPool.2.1.6\lib\net45\SafeObjectPool.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
Expand All @@ -103,8 +103,8 @@
<Reference Include="System.Data.SqlClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SqlClient.4.7.0\lib\net451\System.Data.SqlClient.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite, Version=1.0.111.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.111.0\lib\net451\System.Data.SQLite.dll</HintPath>
<Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net46\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard1.1\System.Memory.dll</HintPath>
Expand Down Expand Up @@ -354,11 +354,11 @@
<None Include="Resources\4g.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets')" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.111.0\build\net451\System.Data.SQLite.Core.targets'))" />
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets'))" />
</Target>
</Project>
20 changes: 10 additions & 10 deletions FSql.Tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AvalonEdit" version="6.0.0" targetFramework="net461" />
<package id="FreeSql" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Extensions.LazyLoading" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Provider.MySqlConnector" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Provider.Oracle" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Provider.PostgreSQL" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Provider.Sqlite" version="0.10.15" targetFramework="net461" />
<package id="FreeSql.Provider.SqlServer" version="0.10.15" targetFramework="net461" />
<package id="FreeSql" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Extensions.LazyLoading" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Provider.MySqlConnector" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Provider.Oracle" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Provider.PostgreSQL" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Provider.Sqlite" version="0.11.21" targetFramework="net461" />
<package id="FreeSql.Provider.SqlServer" version="0.11.21" targetFramework="net461" />
<package id="ICSharpCode.TextEditor" version="3.2.1.6466" targetFramework="net461" />
<package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net461" />
<package id="MySqlConnector" version="0.60.2" targetFramework="net461" />
<package id="MySqlConnector" version="0.60.3" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net451" />
<package id="Npgsql" version="4.1.1" targetFramework="net461" />
<package id="Npgsql.LegacyPostgis" version="4.1.1" targetFramework="net461" />
<package id="Oracle.ManagedDataAccess" version="19.5.0" targetFramework="net461" />
<package id="RazorEngine" version="3.10.0" targetFramework="net461" />
<package id="SafeObjectPool" version="2.1.2" targetFramework="net461" />
<package id="SafeObjectPool" version="2.1.6" targetFramework="net461" />
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
<package id="System.Data.Common" version="4.3.0" targetFramework="net451" />
<package id="System.Data.SqlClient" version="4.7.0" targetFramework="net451" requireReinstallation="true" />
<package id="System.Data.SQLite.Core" version="1.0.111.0" targetFramework="net451" requireReinstallation="true" />
<package id="System.Data.SQLite.Core" version="1.0.112.0" targetFramework="net461" />
<package id="System.Memory" version="4.5.3" targetFramework="net451" requireReinstallation="true" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net461" />
Expand Down
38 changes: 19 additions & 19 deletions FreeSql.Tools/App.config
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
</configSections>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.9.2.0" newVersion="3.9.2.0" />
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.9.2.0" newVersion="3.9.2.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0"/>
</dependentAssembly>
<dependentAssembly>
<publisherPolicy apply="no" />
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
<bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.19.1" />
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
<publisherPolicy apply="no"/>
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral"/>
<bindingRedirect oldVersion="4.121.0.0 - 4.65535.65535.65535" newVersion="4.122.19.1"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.data>
<DbProviderFactories>
<remove invariant="Oracle.ManagedDataAccess.Client" />
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
<remove invariant="Oracle.ManagedDataAccess.Client"/>
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.19.1, Culture=neutral, PublicKeyToken=89b483f429c47342"/>
</DbProviderFactories>
</system.data>
<oracle.manageddataaccess.client>
<version number="*">
<dataSources>
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) "/>
</dataSources>
</version>
</oracle.manageddataaccess.client>
Expand Down
Loading

0 comments on commit 62078a9

Please sign in to comment.