Adapt to new APIs in CCI.

5 files changed, 24 insertions, 54 deletions

diff --git a/BCT/BCT.sln b/BCT/BCT.sln
index 905cc2ea..bd1f5f8f 100644
--- a/BCT/BCT.sln
+++ b/BCT/BCT.sln
@@ -38,57 +38,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings

 	EndProjectSection

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ContractExtractor", "..\..\CCICodePlex\Ast\Sources\ContractExtractor\ContractExtractor.csproj", "{0703D916-A881-45E6-A5CD-6BC50E2E30E2}"

+EndProject

 Global

-	GlobalSection(TeamFoundationVersionControl) = preSolution

-		SccNumberOfProjects = 9

-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccTeamFoundationServer = http://vstfdevdiv:8080/

-		SccProjectUniqueName0 = ..\\..\\Felt\\SourceObjectModel\\CodeModel.csproj

-		SccProjectName0 = $/FELT/SourceObjectModel

-		SccAuxPath0 = http://vstfdevdiv:8080

-		SccLocalPath0 = ..\\..\\Felt\\SourceObjectModel

-		SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName1 = ..\\..\\Felt\\ILToCodeModel\\ILToCodeModel.csproj

-		SccProjectName1 = $/FELT/ILToCodeModel

-		SccAuxPath1 = http://vstfdevdiv:8080

-		SccLocalPath1 = ..\\..\\Felt\\ILToCodeModel

-		SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName2 = ..\\..\\Felt\\ObjectModelHelper\\MetadataHelper.csproj

-		SccProjectName2 = $/FELT/ObjectModelHelper

-		SccAuxPath2 = http://vstfdevdiv:8080

-		SccLocalPath2 = ..\\..\\Felt\\ObjectModelHelper

-		SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName3 = ..\\..\\Felt\\ObjectModel\\MetadataModel.csproj

-		SccProjectName3 = $/FELT/ObjectModel

-		SccAuxPath3 = http://vstfdevdiv:8080

-		SccLocalPath3 = ..\\..\\Felt\\ObjectModel

-		SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName4 = ..\\..\\Felt\\MutableObjectModel\\MutableCodeModel.csproj

-		SccProjectName4 = $/FELT/MutableObjectModel

-		SccAuxPath4 = http://vstfdevdiv:8080

-		SccLocalPath4 = ..\\..\\Felt\\MutableObjectModel

-		SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName5 = ..\\..\\Felt\\MutableMetadataModel\\MutableMetadataModel.csproj

-		SccProjectName5 = $/FELT/MutableMetadataModel

-		SccAuxPath5 = http://vstfdevdiv:8080

-		SccLocalPath5 = ..\\..\\Felt\\MutableMetadataModel

-		SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName6 = ..\\..\\Felt\\PdbReader\\PdbReader.csproj

-		SccProjectName6 = $/FELT/PdbReader

-		SccAuxPath6 = http://vstfdevdiv:8080

-		SccLocalPath6 = ..\\..\\Felt\\PdbReader

-		SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName7 = ..\\..\\Felt\\ModuleReadWrite\\ModuleReadWrite\\PeReader.csproj

-		SccProjectName7 = $/FELT/ModuleReadWrite/ModuleReadWrite

-		SccAuxPath7 = http://vstfdevdiv:8080

-		SccLocalPath7 = ..\\..\\Felt\\ModuleReadWrite\\ModuleReadWrite

-		SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-		SccProjectUniqueName8 = ..\\..\\Felt\\SourceModel\\SourceModel.csproj

-		SccProjectName8 = $/FELT/SourceModel

-		SccAuxPath8 = http://vstfdevdiv:8080

-		SccLocalPath8 = ..\\..\\Felt\\SourceModel

-		SccProvider8 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}

-	EndGlobalSection

 	GlobalSection(TestCaseManagementSettings) = postSolution

 		CategoryFile = BCT.vsmdi

 	EndGlobalSection

@@ -240,6 +192,16 @@ Global
 		{A112AFBA-D6F6-44A4-A683-C3D458A68D84}.NightlyRelease|Any CPU.Build.0 = Release|Any CPU

 		{A112AFBA-D6F6-44A4-A683-C3D458A68D84}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{A112AFBA-D6F6-44A4-A683-C3D458A68D84}.Release|Any CPU.Build.0 = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.CompilerOnly|Any CPU.ActiveCfg = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.CompilerOnly|Any CPU.Build.0 = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.NightlyDebug|Any CPU.ActiveCfg = Debug|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.NightlyDebug|Any CPU.Build.0 = Debug|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.NightlyRelease|Any CPU.ActiveCfg = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.NightlyRelease|Any CPU.Build.0 = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{0703D916-A881-45E6-A5CD-6BC50E2E30E2}.Release|Any CPU.Build.0 = Release|Any CPU

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/BCT/BytecodeTranslator/BytecodeTranslator.csproj b/BCT/BytecodeTranslator/BytecodeTranslator.csproj
index 5867c90c..774057fd 100644
--- a/BCT/BytecodeTranslator/BytecodeTranslator.csproj
+++ b/BCT/BytecodeTranslator/BytecodeTranslator.csproj
@@ -151,6 +151,10 @@
       <Project>{035FEA7F-0D36-4AE4-B694-EC45191B9AF2}</Project>

       <Name>CodeModel</Name>

     </ProjectReference>

+    <ProjectReference Include="..\..\..\CCICodePlex\Ast\Sources\ContractExtractor\ContractExtractor.csproj">

+      <Project>{0703D916-A881-45E6-A5CD-6BC50E2E30E2}</Project>

+      <Name>ContractExtractor</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\..\CCICodePlex\Ast\Sources\ILToCodeModel\ILToCodeModel.csproj">

       <Project>{27F2A417-B6ED-43AD-A38E-A0B6142216F6}</Project>

       <Name>ILToCodeModel</Name>

diff --git a/BCT/BytecodeTranslator/Program.cs b/BCT/BytecodeTranslator/Program.cs
index 139188bb..4b917f24 100644
--- a/BCT/BytecodeTranslator/Program.cs
+++ b/BCT/BytecodeTranslator/Program.cs
@@ -39,7 +39,7 @@ namespace BytecodeTranslator {
 

     static int DoRealWork(string assemblyName) {

 

-      var host = new Microsoft.Cci.ILToCodeModel.CodeContractAwareHostEnvironment();

+      var host = new Microsoft.Cci.MutableContracts.CodeContractAwareHostEnvironment();

       Host = host;

 

       IModule/*?*/ module = host.LoadUnitFrom(assemblyName) as IModule;

@@ -57,7 +57,7 @@ namespace BytecodeTranslator {
         pdbReader = new PdbReader(pdbStream, host);

       }

 

-      module = Decompiler.GetCodeAndContractModelFromMetadataModel(host, module, pdbReader);

+      module = Decompiler.GetCodeModelFromMetadataModel(host, module, pdbReader);

 

       #region Pass 3: Translate the code model to BPL

       //tmp_BPLGenerator translator = new tmp_BPLGenerator(host, acp);

diff --git a/BCT/RegressionTests/TranslationTest/TranslationTest.csproj b/BCT/RegressionTests/TranslationTest/TranslationTest.csproj
index f0520a8f..7379389e 100644
--- a/BCT/RegressionTests/TranslationTest/TranslationTest.csproj
+++ b/BCT/RegressionTests/TranslationTest/TranslationTest.csproj
@@ -80,6 +80,10 @@
       <Project>{035FEA7F-0D36-4AE4-B694-EC45191B9AF2}</Project>

       <Name>CodeModel</Name>

     </ProjectReference>

+    <ProjectReference Include="..\..\..\..\CCICodePlex\Ast\Sources\ContractExtractor\ContractExtractor.csproj">

+      <Project>{0703D916-A881-45E6-A5CD-6BC50E2E30E2}</Project>

+      <Name>ContractExtractor</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\..\..\CCICodePlex\Ast\Sources\ILToCodeModel\ILToCodeModel.csproj">

       <Project>{27F2A417-B6ED-43AD-A38E-A0B6142216F6}</Project>

       <Name>ILToCodeModel</Name>

diff --git a/BCT/RegressionTests/TranslationTest/UnitTest0.cs b/BCT/RegressionTests/TranslationTest/UnitTest0.cs
index 9d487184..5079cc64 100644
--- a/BCT/RegressionTests/TranslationTest/UnitTest0.cs
+++ b/BCT/RegressionTests/TranslationTest/UnitTest0.cs
@@ -62,7 +62,7 @@ namespace TranslationTest {
 

     private string ExecuteTest(string assemblyName) {

 

-      var host = new Microsoft.Cci.ILToCodeModel.CodeContractAwareHostEnvironment();

+      var host = new Microsoft.Cci.MutableContracts.CodeContractAwareHostEnvironment();

       BCT.Host = host;

 

       IModule/*?*/ module = host.LoadUnitFrom(assemblyName) as IModule;

@@ -80,7 +80,7 @@ namespace TranslationTest {
         pdbReader = new PdbReader(pdbStream, host);

       }

 

-      module = Decompiler.GetCodeAndContractModelFromMetadataModel(host, module, pdbReader);

+      module = Decompiler.GetCodeModelFromMetadataModel(host, module, pdbReader);

 

       #region Pass 3: Translate the code model to BPL

       var factory = new CLRSemantics();