Fix up references to things moved into Src.

iskiselev · Dec 11, 2013 · 6d04264 · 6d04264
1 parent 5f0b6be
commit 6d04264
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 27 deletions.
diff --git a/Build/net40.props b/Build/net40.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <WpfReferences Condition="'$(WpfReferences)' == ''">$(SolutionDir)..\Util\References\WPF\4.0</WpfReferences>
+    <WpfReferences Condition="'$(WpfReferences)' == ''">$(RootDir)\Util\References\WPF\4.0</WpfReferences>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <PlatformSymbols>CLR4</PlatformSymbols>
     <IsSilverlight>false</IsSilverlight>

diff --git a/Dlr.sln b/Dlr.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9C454D45-326F-4EA1-8177-64341267A17F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Core", "Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj", "{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Core", "Src\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj", "{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.AspNet", "Hosts\MerlinWeb\Microsoft.Scripting.AspNet\Microsoft.Scripting.AspNet.csproj", "{3272E46C-F4D9-418D-9EE9-081A1B658EE4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.AspNet", "Src\Hosts\MerlinWeb\Microsoft.Scripting.AspNet\Microsoft.Scripting.AspNet.csproj", "{3272E46C-F4D9-418D-9EE9-081A1B658EE4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Silverlight", "Hosts\SilverLight\Microsoft.Scripting.SilverLight\Microsoft.Scripting.Silverlight.csproj", "{C86A7A7B-3086-4136-9B56-17E8DCB38C8D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Silverlight", "Src\Hosts\SilverLight\Microsoft.Scripting.SilverLight\Microsoft.Scripting.Silverlight.csproj", "{C86A7A7B-3086-4136-9B56-17E8DCB38C8D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RowanTest.Common", "Tests\RowanTest.Common\RowanTest.Common.csproj", "{7B67CCAD-3C88-4A1E-8F5C-6AD784DFB52F}"
 EndProject
@@ -19,25 +19,29 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClrAssembly", "Tests\ClrAss
 		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chiron", "Hosts\SilverLight\Chiron\Chiron.csproj", "{7D07B0CE-FFA3-4402-BFF2-5F42B4267D2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chiron", "Src\Hosts\SilverLight\Chiron\Chiron.csproj", "{7D07B0CE-FFA3-4402-BFF2-5F42B4267D2A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{02FF0909-F5AD-48CF-A86A-345E721B7E40} = {02FF0909-F5AD-48CF-A86A-345E721B7E40}
 		{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4} = {2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}
 		{C86A7A7B-3086-4136-9B56-17E8DCB38C8D} = {C86A7A7B-3086-4136-9B56-17E8DCB38C8D}
 		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Dynamic", "Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Dynamic", "Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting", "Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting", "Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Metadata", "Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Scripting.Metadata", "Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Metadata", "Tests\Metadata\Metadata.csproj", "{848BBEB0-63E6-4736-B60C-23A9D733593D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BFEE2666-74E5-49B0-BEB7-1F01CECD7F98}"
 	ProjectSection(SolutionItems) = preProject
-		Build\Build.IronPython.proj = Build\Build.IronPython.proj
+        Build.proj = Build.proj
+        Build\After.targets = Build\After.targets
+		Build\net35.props = Build\net35.props
+		Build\net40.props = Build\net40.props
+		Build\net45.props = Build\net45.props
 		Build\Common.proj = Build\Common.proj
 		Build\Key.snk = Build\Key.snk
 		Build\Versioning.targets = Build\Versioning.targets

diff --git a/Src/Hosts/MerlinWeb/Microsoft.Scripting.AspNet/Microsoft.Scripting.AspNet.csproj b/Src/Hosts/MerlinWeb/Microsoft.Scripting.AspNet/Microsoft.Scripting.AspNet.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(ProjectDir)..\..\..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3272E46C-F4D9-418D-9EE9-081A1B658EE4}</ProjectGuid>

diff --git a/Src/Hosts/Silverlight/Chiron/Chiron.csproj b/Src/Hosts/Silverlight/Chiron/Chiron.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D07B0CE-FFA3-4402-BFF2-5F42B4267D2A}</ProjectGuid>
@@ -67,4 +67,4 @@
     <Folder Include="LCA_RESTRICTED\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Src/Hosts/Silverlight/Microsoft.Scripting.Silverlight/Microsoft.Scripting.Silverlight.csproj b/Src/Hosts/Silverlight/Microsoft.Scripting.Silverlight/Microsoft.Scripting.Silverlight.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(ProjectDir)..\..\..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C86A7A7B-3086-4136-9B56-17E8DCB38C8D}</ProjectGuid>
@@ -62,4 +62,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj b/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(ProjectDir)..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</ProjectGuid>

diff --git a/Src/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj b/Src/Microsoft.Scripting.Core/Microsoft.Scripting.Core.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(ProjectDir)..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</ProjectGuid>

diff --git a/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj b/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(ProjectDir)..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}</ProjectGuid>

diff --git a/Src/Microsoft.Scripting/Microsoft.Scripting.csproj b/Src/Microsoft.Scripting/Microsoft.Scripting.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\Build\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\Build\Common.proj" />
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{02FF0909-F5AD-48CF-A86A-345E721B7E40}</ProjectGuid>

diff --git a/Tests/Metadata/Metadata.csproj b/Tests/Metadata/Metadata.csproj
@@ -37,14 +37,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
+    <ProjectReference Include="..\..\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
       <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
       <Name>Microsoft.Dynamic</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj">
+    <ProjectReference Include="..\..\Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj">
       <Project>{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}</Project>
       <Name>Microsoft.Scripting.Metadata</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/Tests/TestInternalDLR/TestInternalDLR.csproj b/Tests/TestInternalDLR/TestInternalDLR.csproj
@@ -35,15 +35,15 @@
       <Project>{95289EA9-5778-489D-AB48-F81F2CE2DA32}</Project>
       <Name>IronPython %28Languages\IronPython\IronPython%29</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
+    <ProjectReference Include="..\..\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj">
       <Project>{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}</Project>
       <Name>Microsoft.Dynamic</Name>
     </ProjectReference>
     <ProjectReference Include="..\RowanTest.Common\RowanTest.Common.csproj">
       <Project>{7B67CCAD-3C88-4A1E-8F5C-6AD784DFB52F}</Project>
       <Name>RowanTest.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition="'$(FeatureCoreDlr)' != 'true'">
+    <ProjectReference Include="..\..\Src\Microsoft.Scripting.Core\Microsoft.Scripting.Core.csproj" Condition="'$(FeatureCoreDlr)' != 'true'">
       <Project>{2AE75F5A-CD1F-4925-9647-AF4D1C282FB4}</Project>
       <Name>Microsoft.Scripting.Core</Name>
     </ProjectReference>
@@ -52,4 +52,4 @@
     <None Include="app.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
+</Project>
diff --git a/make.cmd b/make.cmd
@@ -61,13 +61,13 @@ Test\test-ipy-tc.cmd /category:Languages\IronPython\IronPython\2.X
 goto :exit
 
 :distclean
-msbuild /t:DistClean /p:BaseConfiguration=Release /verbosity:minimal /nologo
-msbuild /t:DistClean /p:BaseConfiguration=Debug /verbosity:minimal /nologo
+msbuild /t:DistClean /p:BuildFlavour=Release /verbosity:minimal /nologo
+msbuild /t:DistClean /p:BuildFlavour=Debug /verbosity:minimal /nologo
 goto :main
 
 :main
 msbuild Build.proj /t:%_target% /p:BuildFlavour=%_flavour% /verbosity:minimal /nologo
 goto :exit
 
 :exit
-endlocal
+endlocal