Permalink
Browse files

Merge pull request #261 from tommarien/MixedMode

Done necessary config and package changes closes #258
  • Loading branch information...
2 parents 90448ba + 4bd2550 commit 738d79f3bc52547c5ebb51b97cad4de52e3009bb @daniellee daniellee committed Dec 8, 2012
View
@@ -42,10 +42,10 @@
<Choose>
- <When Condition="'$(Version)'=='v4.0'">
+ <When Condition="'$(Version)'=='v3.5'">
<ItemGroup>
<ConfigFileToDelete Include="$(OutputDir)\console-$(Platform)-$(Version)\Migrate.exe.config" />
- <ConfigFileToRename Include="$(OutputDir)\console-$(Platform)-$(Version)\app.40.config" />
+ <ConfigFileToRename Include="$(OutputDir)\console-$(Platform)-$(Version)\app.35.config" />
</ItemGroup>
</When>
<Otherwise>
@@ -89,7 +89,7 @@
<Target Name="_ReplaceAppConfigWithCorrectVersion" DependsOnTargets="_CopyToDistDir">
<Delete Files="@(ConfigFileToDelete)" />
<Copy SourceFiles="@(ConfigFileToRename )" DestinationFiles="$(OutputDir)\console-$(Platform)-$(Version)\Migrate.exe.config" />
- <Delete Files="$(OutputDir)\console-$(Platform)-$(Version)\app.40.config" />
+ <Delete Files="$(OutputDir)\console-$(Platform)-$(Version)\app.35.config" />
</Target>
<Target Name="_BuildForFlavor" DependsOnTargets="_ReplaceAppConfigWithCorrectVersion">
View
@@ -36,7 +36,7 @@ def prepare_lib(version)
def prepare_tools
output_directory_tools = './packages/FluentMigrator/tools/'
FileUtils.mkdir_p output_directory_tools
- cp_r FileList["dist/console-v3.5-x86/*"], output_directory_tools
+ cp_r FileList["dist/console-v4.0-x86/*"], output_directory_tools
end
def prepare_tools_package
View
@@ -44,11 +44,11 @@
cp_r FileList['src/FluentMigrator.Nant/bin/Release/FluentMigrator.Nant.*'], "dist/console-#{v}-#{p}"
cp_r FileList['src/FluentMigrator.MSBuild/bin/Release/FluentMigrator.MSBuild.*'], "dist/console-#{v}-#{p}"
- if to_nuget_version(v) == '40' then
+ if to_nuget_version(v) == '35' then
File.delete("dist/console-#{v}-#{p}/Migrate.exe.config")
- File.rename("dist/console-#{v}-#{p}/app.40.config", "dist/console-#{v}-#{p}/Migrate.exe.config")
+ File.rename("dist/console-#{v}-#{p}/app.35.config", "dist/console-#{v}-#{p}/Migrate.exe.config")
else
- File.delete("dist/console-#{v}-#{p}/app.40.config")
+ File.delete("dist/console-#{v}-#{p}/app.35.config")
end
end
@@ -148,7 +148,7 @@
<Link>FluentMigrator.snk</Link>
</None>
<None Include="app.config" />
- <Content Include="app.40.config">
+ <Content Include="app.35.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<configuration>
+ <startup>
+ <supportedRuntime version="v2.0.50727"/>
+ </startup>
+</configuration>
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
- <startup useLegacyV2RuntimeActivationPolicy="true">
- <supportedRuntime version="v4.0.30319" />
- </startup>
-</configuration>
@@ -1,6 +1,7 @@
<?xml version="1.0"?>
<configuration>
- <startup>
- <supportedRuntime version="v2.0.50727"/>
- </startup>
+ <startup useLegacyV2RuntimeActivationPolicy="true">
+ <supportedRuntime version="v4.0" />
+ <supportedRuntime version="v2.0.50727"/>
+ </startup>
</configuration>

0 comments on commit 738d79f

Please sign in to comment.