Changeset 275
- Timestamp:
- 09/04/08 19:39:52 (3 months ago)
- Files:
-
- trunk/Source/Migrations/Machine.Migrations.Tests/Services/Impl/MigrationFactoryChooserTests.cs (modified) (1 diff)
- trunk/Source/Migrations/Machine.Migrations/MigratorTask.cs (modified) (2 diffs)
- trunk/Source/Migrations/Machine.Migrations/Services/IConfiguration.cs (modified) (1 diff)
- trunk/Source/Migrations/Machine.Migrations/Services/Impl/CSharpMigrationFactory.cs (modified) (4 diffs)
- trunk/Source/Migrations/Machine.Migrations/Services/Impl/StaticMigratorConfiguration.cs (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Source/Migrations/Machine.Migrations.Tests/Services/Impl/MigrationFactoryChooserTests.cs
r153 r275 44 44 _fileSystem = _mocks.DynamicMock<IFileSystem>(); 45 45 _workingDirectoryManager = _mocks.DynamicMock<IWorkingDirectoryManager>(); 46 _cSharpMigrationFactory = new CSharpMigrationFactory(_configuration, _ fileSystem, _workingDirectoryManager);46 _cSharpMigrationFactory = new CSharpMigrationFactory(_configuration, _workingDirectoryManager); 47 47 _booMigrationFactory = new BooMigrationFactory(_configuration, _workingDirectoryManager); 48 48 return new MigrationFactoryChooser(_cSharpMigrationFactory, _booMigrationFactory); trunk/Source/Migrations/Machine.Migrations/MigratorTask.cs
r176 r275 22 22 bool _diagnostics; 23 23 string[] _references; 24 string _compilerVersion; 24 25 25 26 public MigratorTask() … … 70 71 get { return _desiredVersion; } 71 72 set { _desiredVersion = value; } 73 } 74 75 public string CompilerVersion 76 { 77 get { return _compilerVersion; } 78 set { _compilerVersion = value; } 72 79 } 73 80 trunk/Source/Migrations/Machine.Migrations/Services/IConfiguration.cs
r152 r275 19 19 string MigrationsDirectory { get; } 20 20 21 string CompilerVersion { get; } 22 21 23 short DesiredVersion { get; } 22 24 trunk/Source/Migrations/Machine.Migrations/Services/Impl/CSharpMigrationFactory.cs
r152 r275 1 1 using System; 2 2 using System.CodeDom.Compiler; 3 using System.Collections.Generic; 3 4 using System.Data.SqlTypes; 4 5 using System.IO; … … 6 7 7 8 using Machine.Core.Services; 9 using Microsoft.CSharp; 8 10 9 11 namespace Machine.Migrations.Services.Impl … … 17 19 #region Member Data 18 20 readonly IConfiguration _configuration; 19 readonly IFileSystem _fileSystem;20 21 readonly IWorkingDirectoryManager _workingDirectoryManager; 21 22 #endregion 22 23 23 24 #region CSharpMigrationFactory() 24 public CSharpMigrationFactory(IConfiguration configuration, IFileSystem fileSystem, 25 IWorkingDirectoryManager workingDirectoryManager) 25 public CSharpMigrationFactory(IConfiguration configuration, IWorkingDirectoryManager workingDirectoryManager) 26 26 { 27 27 _configuration = configuration; 28 28 _workingDirectoryManager = workingDirectoryManager; 29 _fileSystem = fileSystem;30 29 } 31 30 #endregion … … 40 39 protected override Type CompileMigration(MigrationReference migrationReference) 41 40 { 42 CodeDomProvider provider = CodeDomProvider.CreateProvider("CSharp"); 41 Dictionary<string, string> providerOptions = new Dictionary<string, string>(); 42 if (!String.IsNullOrEmpty(_configuration.CompilerVersion)) 43 { 44 providerOptions["CompilerVersion"] = _configuration.CompilerVersion; 45 } 46 CodeDomProvider provider = new CSharpCodeProvider(providerOptions); 43 47 CompilerParameters parameters = new CompilerParameters(); 44 48 parameters.GenerateExecutable = false; trunk/Source/Migrations/Machine.Migrations/Services/Impl/StaticMigratorConfiguration.cs
r152 r275 15 15 string _migrationsDirectory; 16 16 string _scope; 17 string _compilerVersion; 17 18 short _desiredVersion = -1; 18 19 bool _showDiagnostics; … … 80 81 } 81 82 83 public string CompilerVersion 84 { 85 get { return _compilerVersion; } 86 set { _compilerVersion = value; } 87 } 88 82 89 public string ConnectionString 83 90 {