diff --git a/product/roundhouse.console/roundhouse.console.csproj b/product/roundhouse.console/roundhouse.console.csproj index daf061a3..5016073a 100644 --- a/product/roundhouse.console/roundhouse.console.csproj +++ b/product/roundhouse.console/roundhouse.console.csproj @@ -96,11 +96,11 @@ ..\..\build.custom\ilmerge.internalize.ignore.txt ..\..\lib\ILMerge\ILMerge.exe - $(ILMergeDir)ILMerge.log + $(ILMergeDir)roundhouse.console.ILMerge.log $(OutputPath)$(AssemblyName).exe $(ILMerge) /internalize:$(IgnoreFile) /target:exe /out:$(ILMergeTarget) /log:$(ILMergeLog) /ndebug /zeroPeKind /allowDup $(ILMergeSource) @(ILMergeAssemblies, ' ') - + diff --git a/product/roundhouse.console/roundhouse.nuspec b/product/roundhouse.console/roundhouse.nuspec index 6e8ecf8b..4be0799a 100644 --- a/product/roundhouse.console/roundhouse.nuspec +++ b/product/roundhouse.console/roundhouse.nuspec @@ -4,8 +4,8 @@ roundhouse RoundhousE $version$ - Rob Reynolds - Rob Reynolds + Rob Reynolds, Andy Davis, Erik A. Brandstadmoen + Rob Reynolds, Andy Davis, Erik A. Brandstadmoen RoundhousE - Professional Database Change and Versioning Management RoundhousE is a Professional Database Change and Versioning Management tool. Type rh /? for options http://projectroundhouse.org diff --git a/product/roundhouse.databases.access/roundhouse.databases.access.csproj b/product/roundhouse.databases.access/roundhouse.databases.access.csproj index 8baef1ed..47643cf6 100644 --- a/product/roundhouse.databases.access/roundhouse.databases.access.csproj +++ b/product/roundhouse.databases.access/roundhouse.databases.access.csproj @@ -43,10 +43,8 @@ - - - - + + diff --git a/product/roundhouse.databases.mysql/roundhouse.databases.mysql.csproj b/product/roundhouse.databases.mysql/roundhouse.databases.mysql.csproj index d6a1b372..568d70cd 100644 --- a/product/roundhouse.databases.mysql/roundhouse.databases.mysql.csproj +++ b/product/roundhouse.databases.mysql/roundhouse.databases.mysql.csproj @@ -41,10 +41,8 @@ - - - - + + diff --git a/product/roundhouse.databases.postgresql/roundhouse.databases.postgresql.csproj b/product/roundhouse.databases.postgresql/roundhouse.databases.postgresql.csproj index 16ad0bcd..dab3cae6 100644 --- a/product/roundhouse.databases.postgresql/roundhouse.databases.postgresql.csproj +++ b/product/roundhouse.databases.postgresql/roundhouse.databases.postgresql.csproj @@ -42,8 +42,6 @@ - - diff --git a/product/roundhouse.databases.sqlite/roundhouse.databases.sqlite.csproj b/product/roundhouse.databases.sqlite/roundhouse.databases.sqlite.csproj index f967a210..365b2bd0 100644 --- a/product/roundhouse.databases.sqlite/roundhouse.databases.sqlite.csproj +++ b/product/roundhouse.databases.sqlite/roundhouse.databases.sqlite.csproj @@ -47,14 +47,8 @@ - - - - - - diff --git a/product/roundhouse.databases.sqlserver/roundhouse.databases.sqlserver.csproj b/product/roundhouse.databases.sqlserver/roundhouse.databases.sqlserver.csproj index 02b0800c..bd367eff 100644 --- a/product/roundhouse.databases.sqlserver/roundhouse.databases.sqlserver.csproj +++ b/product/roundhouse.databases.sqlserver/roundhouse.databases.sqlserver.csproj @@ -39,8 +39,9 @@ - + + diff --git a/product/roundhouse.lib.merged/roundhouse.lib.merged.csproj b/product/roundhouse.lib.merged/roundhouse.lib.merged.csproj new file mode 100644 index 00000000..f04cbe09 --- /dev/null +++ b/product/roundhouse.lib.merged/roundhouse.lib.merged.csproj @@ -0,0 +1,110 @@ + + + net461 + true + true + Debug + AnyCPU + Library + Properties + roundhouse + roundhouse.lib.merged + ..\..\ + NU1701 + true + true + AllRules.ruleset + bin\$(Configuration)\ + 0.8.9 + alpha + $(VersionPrefix) + $(Version)-$(VersionSuffix) + $(Version) + $(NugetVersion) + roundhouse.lib + RoundhousE Library + Rob Reynolds + RoundhousE is a Professional Database Change and Versioning Management tool. + http://projectroundhouse.org + http://www.apache.org/licenses/LICENSE-2.0 + false + roundhouse db migration database migrator chucknorris + https://raw.github.com/chucknorris/roundhouse/master/nuget/RoundhousE_Logo.NuGet.jpg + + + true + full + false + DEBUG;TRACE + prompt + 4 + AnyCPU + AllRules.ruleset + false + 5 + + + none + true + TRACE + prompt + 4 + AnyCPU + AllRules.ruleset + false + + + + + + + + + + + + + + + roundhouse.ico + + + + + + ..\..\code_drop\merge\ + $(ILMergeDir)roundhouse.dll + + + + + + + + + ..\..\build.custom\ilmerge.internalize.ignore.txt + ..\..\lib\ILMerge\ILMerge.exe + $(ILMergeDir)roundhouse.ILMerge.log + $(ILMerge) /internalize:$(IgnoreFile) /target:dll /out:$(ILMergeTarget) /log:$(ILMergeLog) /ndebug /zeroPeKind /allowDup @(ILMergeAssemblies, ' ') + + + + + + + + + + + roundhouse.lib.nuspec + mergedDll=$(ILMergeTarget);version=$(NugetVersion) + + + + + + + + + + \ No newline at end of file diff --git a/product/roundhouse.lib.merged/roundhouse.lib.nuspec b/product/roundhouse.lib.merged/roundhouse.lib.nuspec new file mode 100644 index 00000000..4ae55632 --- /dev/null +++ b/product/roundhouse.lib.merged/roundhouse.lib.nuspec @@ -0,0 +1,31 @@ + + + + roundhouse.lib + RoundhousE Library + $version$ + Rob Reynolds, Andy Davis, Erik A. Brandstadmoen + Rob Reynolds + RoundhousE - Professional Database Change and Versioning Management + RoundhousE is a Professional Database Change and Versioning Management tool. Type rh /? for options + http://projectroundhouse.org + http://www.apache.org/licenses/LICENSE-2.0 + false + roundhouse db migration database migrator chucknorris + + + + + + + + + + + + https://raw.github.com/chucknorris/roundhouse/master/nuget/RoundhousE_Logo.NuGet.jpg + + + + + diff --git a/product/roundhouse/roundhouse.csproj b/product/roundhouse/roundhouse.csproj index 2474c43e..852f2531 100644 --- a/product/roundhouse/roundhouse.csproj +++ b/product/roundhouse/roundhouse.csproj @@ -22,17 +22,6 @@ $(Version)-$(VersionSuffix) $(Version) - $(NugetVersion) - roundhouse.lib - RoundhousE Library - Rob Reynolds - RoundhousE is a Professional Database Change and Versioning Management tool. - http://projectroundhouse.org - http://www.apache.org/licenses/LICENSE-2.0 - false - roundhouse db migration database migrator chucknorris - https://raw.github.com/chucknorris/roundhouse/master/nuget/RoundhousE_Logo.NuGet.jpg - diff --git a/roundhouse.sln b/roundhouse.sln index 79eedd8a..92b34f97 100644 --- a/roundhouse.sln +++ b/roundhouse.sln @@ -45,6 +45,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "roundhouse.databases.postgr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "roundhouse.databases.sqlserverce", "product\roundhouse.databases.sqlserverce\roundhouse.databases.sqlserverce.csproj", "{3447F080-CF50-4B02-9521-671E7AEE8D34}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "roundhouse.lib.merged", "product\roundhouse.lib.merged\roundhouse.lib.merged.csproj", "{6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Build|Any CPU = Build|Any CPU @@ -130,6 +132,12 @@ Global {3447F080-CF50-4B02-9521-671E7AEE8D34}.Debug|Any CPU.Build.0 = Debug|Any CPU {3447F080-CF50-4B02-9521-671E7AEE8D34}.Release|Any CPU.ActiveCfg = Release|Any CPU {3447F080-CF50-4B02-9521-671E7AEE8D34}.Release|Any CPU.Build.0 = Release|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Build|Any CPU.ActiveCfg = Debug|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Build|Any CPU.Build.0 = Debug|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BB8E05F-CEC6-4CC8-87CF-8A9C439C8122}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE