Skip to content

Commit ae3bef5

Browse files
filipwfilipw
committed
removed ScriptCs.Engine.Roslyn and added the new engine projects
1 parent cdc2156 commit ae3bef5

9 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎ScriptCs.sln‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{9659F354
2424
build\ScriptCs.Version.props = build\ScriptCs.Version.props
2525
EndProjectSection
2626
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Engine.Roslyn", "src\ScriptCs.Engine.Roslyn\ScriptCs.Engine.Roslyn.csproj", "{E79EC231-E27D-4057-91C9-2D001A3A8C3B}"
28-
EndProject
2927
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Engine.Roslyn.Tests", "test\ScriptCs.Engine.Roslyn.Tests\ScriptCs.Engine.Roslyn.Tests.csproj", "{28D11DE5-9F98-4E0A-8CCC-9CDC19110451}"
3028
EndProject
3129
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Hosting", "src\ScriptCs.Hosting\ScriptCs.Hosting.csproj", "{9AEF2D95-87FB-4829-B384-34BFE076D531}"
@@ -46,6 +44,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{B13804
4644
.nuget\packages.config = .nuget\packages.config
4745
EndProjectSection
4846
EndProject
47+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.CSharp", "src\ScriptCs.CSharp\ScriptCs.CSharp.csproj", "{E79EC231-E27D-4057-91C9-2D001A3A8C3B}"
48+
EndProject
49+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.VisualBasic", "src\ScriptCs.VisualBasic\ScriptCs.VisualBasic.csproj", "{4C68DC34-60AB-405B-878F-377CF6C4336C}"
50+
EndProject
51+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptCs.Engine.Common", "src\ScriptCs.Engine.Common\ScriptCs.Engine.Common.csproj", "{38A12481-8652-4A9C-9D90-1C15043EFEE5}"
52+
EndProject
4953
Global
5054
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5155
Debug|Any CPU = Debug|Any CPU
@@ -72,10 +76,6 @@ Global
7276
{AC228213-7356-4F0D-BA48-EBA5FB8A7506}.Debug|Any CPU.Build.0 = Debug|Any CPU
7377
{AC228213-7356-4F0D-BA48-EBA5FB8A7506}.Release|Any CPU.ActiveCfg = Release|Any CPU
7478
{AC228213-7356-4F0D-BA48-EBA5FB8A7506}.Release|Any CPU.Build.0 = Release|Any CPU
75-
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
76-
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
77-
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
78-
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Release|Any CPU.Build.0 = Release|Any CPU
7979
{28D11DE5-9F98-4E0A-8CCC-9CDC19110451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8080
{28D11DE5-9F98-4E0A-8CCC-9CDC19110451}.Debug|Any CPU.Build.0 = Debug|Any CPU
8181
{28D11DE5-9F98-4E0A-8CCC-9CDC19110451}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -100,6 +100,18 @@ Global
100100
{10684649-2922-41F5-AB9B-20B127CBF92C}.Debug|Any CPU.Build.0 = Debug|Any CPU
101101
{10684649-2922-41F5-AB9B-20B127CBF92C}.Release|Any CPU.ActiveCfg = Release|Any CPU
102102
{10684649-2922-41F5-AB9B-20B127CBF92C}.Release|Any CPU.Build.0 = Release|Any CPU
103+
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104+
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
105+
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
106+
{E79EC231-E27D-4057-91C9-2D001A3A8C3B}.Release|Any CPU.Build.0 = Release|Any CPU
107+
{4C68DC34-60AB-405B-878F-377CF6C4336C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108+
{4C68DC34-60AB-405B-878F-377CF6C4336C}.Debug|Any CPU.Build.0 = Debug|Any CPU
109+
{4C68DC34-60AB-405B-878F-377CF6C4336C}.Release|Any CPU.ActiveCfg = Release|Any CPU
110+
{4C68DC34-60AB-405B-878F-377CF6C4336C}.Release|Any CPU.Build.0 = Release|Any CPU
111+
{38A12481-8652-4A9C-9D90-1C15043EFEE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
112+
{38A12481-8652-4A9C-9D90-1C15043EFEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
113+
{38A12481-8652-4A9C-9D90-1C15043EFEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{38A12481-8652-4A9C-9D90-1C15043EFEE5}.Release|Any CPU.Build.0 = Release|Any CPU
103115
EndGlobalSection
104116
GlobalSection(SolutionProperties) = preSolution
105117
HideSolutionNode = FALSE

‎src/ScriptCs.CSharp/ScriptCs.CSharp.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
</Reference>
6363
<Reference Include="ScriptCs.Contracts, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\ScriptCs.Contracts.0.14.1\lib\net45\ScriptCs.Contracts.dll</HintPath>
65+
<HintPath>..\ScriptCs.Contracts\bin\Debug\ScriptCs.Contracts.dll</HintPath>
6666
</Reference>
6767
<Reference Include="ScriptCs.Core, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\ScriptCs.Core.0.14.1\lib\net45\ScriptCs.Core.dll</HintPath>
69+
<HintPath>..\ScriptCs.Core\bin\Debug\ScriptCs.Core.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ScriptCs.CSharp/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net45" />
77
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="1.0.0-rc2" targetFramework="net45" />
88
<package id="Microsoft.CodeAnalysis.Scripting.CSharp" version="1.0.0-rc2" targetFramework="net45" />
9-
<package id="ScriptCs.Contracts" version="0.14.1" targetFramework="net45" />
10-
<package id="ScriptCs.Core" version="0.14.1" targetFramework="net45" />
119
<package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
1210
<package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
1311
</packages>

‎src/ScriptCs.Engine.Common/ScriptCs.Engine.Common.csproj‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@
4949
<SpecificVersion>False</SpecificVersion>
5050
<HintPath>..\packages\Microsoft.CodeAnalysis.Scripting.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Scripting.dll</HintPath>
5151
</Reference>
52-
<Reference Include="ScriptCs.Contracts, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>..\packages\ScriptCs.Contracts.0.14.1\lib\net45\ScriptCs.Contracts.dll</HintPath>
55-
</Reference>
56-
<Reference Include="ScriptCs.Core, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
57-
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\packages\ScriptCs.Core.0.14.1\lib\net45\ScriptCs.Core.dll</HintPath>
59-
</Reference>
6052
<Reference Include="System" />
6153
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6254
<Private>True</Private>
@@ -86,6 +78,16 @@
8678
<None Include="packages.config" />
8779
<None Include="ScriptCs.Engine.Common.nuspec" />
8880
</ItemGroup>
81+
<ItemGroup>
82+
<ProjectReference Include="..\ScriptCs.Contracts\ScriptCs.Contracts.csproj">
83+
<Project>{6049e205-8b5f-4080-b023-70600e51fd64}</Project>
84+
<Name>ScriptCs.Contracts</Name>
85+
</ProjectReference>
86+
<ProjectReference Include="..\ScriptCs.Core\ScriptCs.Core.csproj">
87+
<Project>{e590e710-e159-48e6-a3e6-1a83d3fe732c}</Project>
88+
<Name>ScriptCs.Core</Name>
89+
</ProjectReference>
90+
</ItemGroup>
8991
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9092
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9193
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎src/ScriptCs.Engine.Common/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net45" />
55
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net45" />
66
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="1.0.0-rc2" targetFramework="net45" />
7-
<package id="ScriptCs.Contracts" version="0.14.1" targetFramework="net45" />
8-
<package id="ScriptCs.Core" version="0.14.1" targetFramework="net45" />
97
<package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
108
<package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
119
</packages>

‎src/ScriptCs.VisualBasic/ScriptCs.VisualBasic.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
</Reference>
6363
<Reference Include="ScriptCs.Contracts, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
6464
<SpecificVersion>False</SpecificVersion>
65-
<HintPath>..\packages\ScriptCs.Contracts.0.14.1\lib\net45\ScriptCs.Contracts.dll</HintPath>
65+
<HintPath>..\ScriptCs.Contracts\bin\Debug\ScriptCs.Contracts.dll</HintPath>
6666
</Reference>
6767
<Reference Include="ScriptCs.Core, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
6868
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\packages\ScriptCs.Core.0.14.1\lib\net45\ScriptCs.Core.dll</HintPath>
69+
<HintPath>..\ScriptCs.Core\bin\Debug\ScriptCs.Core.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/ScriptCs.VisualBasic/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="1.0.0-rc2" targetFramework="net45" />
77
<package id="Microsoft.CodeAnalysis.Scripting.VisualBasic" version="1.0.0-rc2" targetFramework="net45" />
88
<package id="Microsoft.CodeAnalysis.VisualBasic" version="1.0.0-rc2" targetFramework="net45" />
9-
<package id="ScriptCs.Contracts" version="0.14.1" targetFramework="net45" />
10-
<package id="ScriptCs.Core" version="0.14.1" targetFramework="net45" />
119
<package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net45" />
1210
<package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net45" />
1311
</packages>

‎src/ScriptCs/ScriptCs.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@
155155
<Project>{e4adcfee-ff3b-4ef5-8298-2b31f407f58b}</Project>
156156
<Name>ScriptCs.Engine.Mono</Name>
157157
</ProjectReference>
158-
<ProjectReference Include="..\ScriptCs.Engine.Roslyn\ScriptCs.Engine.Roslyn.csproj">
159-
<Project>{e79ec231-e27d-4057-91c9-2d001a3a8c3b}</Project>
160-
<Name>ScriptCs.Engine.Roslyn</Name>
161-
</ProjectReference>
162158
<ProjectReference Include="..\ScriptCs.Hosting\ScriptCs.Hosting.csproj">
163159
<Project>{9aef2d95-87fb-4829-b384-34bfe076d531}</Project>
164160
<Name>ScriptCs.Hosting</Name>

‎test/ScriptCs.Engine.Roslyn.Tests/ScriptCs.Engine.Roslyn.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@
101101
<Project>{e590e710-e159-48e6-a3e6-1a83d3fe732c}</Project>
102102
<Name>ScriptCs.Core</Name>
103103
</ProjectReference>
104-
<ProjectReference Include="..\..\src\ScriptCs.Engine.Roslyn\ScriptCs.Engine.Roslyn.csproj">
105-
<Project>{e79ec231-e27d-4057-91c9-2d001a3a8c3b}</Project>
106-
<Name>ScriptCs.Engine.Roslyn</Name>
107-
</ProjectReference>
108104
</ItemGroup>
109105
<Import Project="..\..\build\ScriptCs.Common.props" />
110106
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

0 commit comments

Comments
 (0)