diff --git a/build.cake b/build.cake index 61a4ddd6b1..921cf85b2f 100644 --- a/build.cake +++ b/build.cake @@ -461,31 +461,25 @@ Task("CreateMSBuildFolder") FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.exe.config")); FileHelper.Delete(CombinePaths(compilersTargetFolder, "vbc.rsp")); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.core.dll"), overwrite: true); FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), overwrite: true); FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net461", "SQLitePCLRaw.batteries_v2.dll"), destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_v2.dll"), overwrite: true); FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.batteries_green.dll"), + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net461", "SQLitePCLRaw.nativelibrary.dll"), + destination: CombinePaths(msbuildCurrentBinTargetFolder, "SQLitePCLRaw.nativelibrary.dll"), overwrite: true); - - var msbuild15TargetFolder = CombinePaths(env.Folders.MSBuild, "15.0"); - if (!Platform.Current.IsWindows) - { - DirectoryHelper.Copy(msbuildCurrentTargetFolder, msbuild15TargetFolder); - } }); /// @@ -696,27 +690,6 @@ void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolde var msbuildBinFolder = CombinePaths(msbuildFolder, "bin", "Current"); EnsureDirectoryExists(msbuildBinFolder); - - // Copy dependencies of Mono build - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.core.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_v2.dll"), - overwrite: true); - - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(msbuildBinFolder, "SQLitePCLRaw.batteries_green.dll"), - overwrite: true); } void CopyExtraDependencies(BuildEnvironment env, string outputFolder) @@ -737,23 +710,23 @@ string PublishMonoBuild(string project, BuildEnvironment env, BuildPlan plan, st CopyExtraDependencies(env, outputFolder); - // Copy dependencies of Mono build - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "net45", "SQLitePCLRaw.core.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3.net45", "lib", "net45", "SQLitePCLRaw.provider.e_sqlite3.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_v2.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"), - overwrite: true); - FileHelper.Copy( - source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net45", "SQLitePCLRaw.batteries_green.dll"), - destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_green.dll"), - overwrite: true); + // Copy dependencies of Mono build + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.core", "lib", "netstandard2.0", "SQLitePCLRaw.core.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.core.dll"), + overwrite: true); + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.provider.e_sqlite3", "lib", "netstandard2.0", "SQLitePCLRaw.provider.e_sqlite3.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.provider.e_sqlite3.dll"), + overwrite: true); + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net461", "SQLitePCLRaw.batteries_v2.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.batteries_v2.dll"), + overwrite: true); + FileHelper.Copy( + source: CombinePaths(env.Folders.Tools, "SQLitePCLRaw.bundle_green", "lib", "net461", "SQLitePCLRaw.nativelibrary.dll"), + destination: CombinePaths(outputFolder, "SQLitePCLRaw.nativelibrary.dll"), + overwrite: true); Package(project, "mono", outputFolder, env.Folders.ArtifactsPackage, env.Folders.DeploymentPackage); diff --git a/tools/packages.config b/tools/packages.config index 003dd01c46..96e1ec14f2 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -28,9 +28,9 @@ - - - + + +