Skip to content

Commit ee7bc01

Browse files
masoomasoo
committed
fix compiling environment in VS2017
1 parent e1672e1 commit ee7bc01

File tree

7 files changed

+211
-122
lines changed

7 files changed

+211
-122
lines changed

‎ruby-csharp_script.sln

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26430.13
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ruby-csharp_script", "ruby-csharp_script\ruby-csharp_script.csproj", "{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|x86 = Debug|x86
11-
Release|x86 = Release|x86
10+
Debug|Any CPU = Debug|Any CPU
11+
Debug|x64 = Debug|x64
12+
Release|Any CPU = Release|Any CPU
13+
Release|x64 = Release|x64
1214
EndGlobalSection
1315
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Debug|x86.ActiveCfg = Debug|x86
15-
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Debug|x86.Build.0 = Debug|x86
16-
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Release|x86.ActiveCfg = Release|x86
17-
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Release|x86.Build.0 = Release|x86
16+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Debug|Any CPU.ActiveCfg = Debug|x64
17+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Debug|x64.ActiveCfg = Debug|x64
18+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Debug|x64.Build.0 = Debug|x64
19+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Release|Any CPU.ActiveCfg = Release|x64
20+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Release|x64.ActiveCfg = Release|x64
21+
{26EF5196-B3B6-4CD3-BA09-C8D9D4ED4CC0}.Release|x64.Build.0 = Release|x64
1822
EndGlobalSection
1923
GlobalSection(SolutionProperties) = preSolution
2024
HideSolutionNode = FALSE

‎ruby-csharp_script/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("ruby-csharp_script")]
13-
[assembly: AssemblyCopyright("Copyright © 2016")]
13+
[assembly: AssemblyCopyright("Copyright © 2017")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

‎ruby-csharp_script/app.config

Lines changed: 84 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,104 @@
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
66
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.2.0.0" />
88
</dependentAssembly>
99
<dependentAssembly>
1010
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11-
<bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
11+
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
1515
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
2222
<assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
35+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
36+
</dependentAssembly>
37+
<dependentAssembly>
38+
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
39+
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
40+
</dependentAssembly>
41+
<dependentAssembly>
42+
<assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2343
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
2444
</dependentAssembly>
45+
<dependentAssembly>
46+
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
47+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
48+
</dependentAssembly>
49+
<dependentAssembly>
50+
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
51+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
52+
</dependentAssembly>
53+
<dependentAssembly>
54+
<assemblyIdentity name="System.Linq" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
55+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
56+
</dependentAssembly>
57+
<dependentAssembly>
58+
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
59+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
60+
</dependentAssembly>
61+
<dependentAssembly>
62+
<assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
63+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
64+
</dependentAssembly>
65+
<dependentAssembly>
66+
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
67+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
68+
</dependentAssembly>
69+
<dependentAssembly>
70+
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
71+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
72+
</dependentAssembly>
73+
<dependentAssembly>
74+
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
75+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
76+
</dependentAssembly>
77+
<dependentAssembly>
78+
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
79+
<bindingRedirect oldVersion="0.0.0.0-1.0.30.0" newVersion="1.0.30.0" />
80+
</dependentAssembly>
81+
<dependentAssembly>
82+
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
83+
<bindingRedirect oldVersion="0.0.0.0-1.0.30.0" newVersion="1.0.30.0" />
84+
</dependentAssembly>
85+
<dependentAssembly>
86+
<assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
87+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
88+
</dependentAssembly>
89+
<dependentAssembly>
90+
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
91+
<bindingRedirect oldVersion="0.0.0.0-1.0.30.0" newVersion="1.0.30.0" />
92+
</dependentAssembly>
93+
<dependentAssembly>
94+
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
95+
<bindingRedirect oldVersion="0.0.0.0-1.0.30.0" newVersion="1.0.30.0" />
96+
</dependentAssembly>
97+
<dependentAssembly>
98+
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
99+
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
100+
</dependentAssembly>
101+
<dependentAssembly>
102+
<assemblyIdentity name="System.AppContext" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
103+
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
104+
</dependentAssembly>
25105
</assemblyBinding>
26106
</runtime>
27-
</configuration>
107+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup></configuration>

‎ruby-csharp_script/csharp_script/CSharpScriptEvents.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace ruby.csharp_script
55
{
6-
[Guid("A815777C-A3F0-4A09-864F-9C6CDEEA3BBF")
6+
[Guid("A815777C-A3F0-4A09-864F-9C6CDEEA3BBF"),
77
InterfaceType(ComInterfaceType.InterfaceIsIDispatch)]
88
public interface CSharpScriptEvents
99
{

‎ruby-csharp_script/csharp_script/CsharpScript.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ruby.csharp_script
77
/// <summary>
88
/// CSharpScript wrapper.
99
/// </summary>
10-
[Guid("31D3AA19-291D-449C-9B2B-E02B9D6F766C")
10+
[Guid("31D3AA19-291D-449C-9B2B-E02B9D6F766C"),
1111
ClassInterface(ClassInterfaceType.AutoDispatch),
1212
ComSourceInterfaces(typeof(CSharpScriptEvents))]
1313
public class CSharpScript : CSharpScriptInterface

‎ruby-csharp_script/packages.config

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net461" />
4-
<package id="Microsoft.CodeAnalysis.Common" version="1.2.2" targetFramework="net461" />
5-
<package id="Microsoft.CodeAnalysis.CSharp" version="1.2.2" targetFramework="net461" />
6-
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="1.2.2" targetFramework="net461" />
7-
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="1.2.2" targetFramework="net461" />
8-
<package id="System.AppContext" version="4.1.0" targetFramework="net461" />
9-
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
10-
<package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net461" />
11-
<package id="System.Collections.Immutable" version="1.2.0" targetFramework="net461" />
12-
<package id="System.Console" version="4.0.0" targetFramework="net461" />
13-
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
14-
<package id="System.Diagnostics.FileVersionInfo" version="4.0.0" targetFramework="net461" />
15-
<package id="System.Diagnostics.StackTrace" version="4.0.1" targetFramework="net461" />
16-
<package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net461" />
17-
<package id="System.Dynamic.Runtime" version="4.0.11" targetFramework="net461" />
18-
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
19-
<package id="System.IO" version="4.1.0" targetFramework="net461" />
20-
<package id="System.IO.FileSystem" version="4.0.0" targetFramework="net461" />
21-
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
22-
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
23-
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
24-
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
25-
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
26-
<package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net461" />
27-
<package id="System.Reflection.Primitives" version="4.0.1" targetFramework="net461" />
28-
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
29-
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
30-
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
31-
<package id="System.Runtime.Handles" version="4.0.1" targetFramework="net461" />
32-
<package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net461" />
33-
<package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net461" />
34-
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
35-
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
36-
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
37-
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
38-
<package id="System.Text.Encoding" version="4.0.11" targetFramework="net461" />
39-
<package id="System.Text.Encoding.CodePages" version="4.0.1" targetFramework="net461" />
40-
<package id="System.Text.Encoding.Extensions" version="4.0.11" targetFramework="net461" />
41-
<package id="System.Threading" version="4.0.11" targetFramework="net461" />
42-
<package id="System.Threading.Tasks" version="4.0.11" targetFramework="net461" />
43-
<package id="System.Threading.Tasks.Parallel" version="4.0.1" targetFramework="net461" />
44-
<package id="System.Threading.Thread" version="4.0.0" targetFramework="net461" />
45-
<package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net461" />
46-
<package id="System.Xml.XDocument" version="4.0.11" targetFramework="net461" />
47-
<package id="System.Xml.XmlDocument" version="4.0.1" targetFramework="net461" />
48-
<package id="System.Xml.XPath" version="4.0.1" targetFramework="net461" />
49-
<package id="System.Xml.XPath.XDocument" version="4.0.1" targetFramework="net461" />
3+
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net47" />
4+
<package id="Microsoft.CodeAnalysis.Common" version="1.2.2" targetFramework="net47" />
5+
<package id="Microsoft.CodeAnalysis.CSharp" version="1.2.2" targetFramework="net47" />
6+
<package id="Microsoft.CodeAnalysis.CSharp.Scripting" version="1.2.2" targetFramework="net47" />
7+
<package id="Microsoft.CodeAnalysis.Scripting.Common" version="1.2.2" targetFramework="net47" />
8+
<package id="System.AppContext" version="4.3.0" targetFramework="net47" />
9+
<package id="System.Collections" version="4.3.0" targetFramework="net47" />
10+
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net47" />
11+
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net47" />
12+
<package id="System.Console" version="4.3.0" targetFramework="net47" />
13+
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net47" />
14+
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net47" />
15+
<package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net47" />
16+
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net47" />
17+
<package id="System.Dynamic.Runtime" version="4.3.0" targetFramework="net47" />
18+
<package id="System.Globalization" version="4.3.0" targetFramework="net47" />
19+
<package id="System.IO" version="4.3.0" targetFramework="net47" />
20+
<package id="System.IO.FileSystem" version="4.0.0" targetFramework="net47" />
21+
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net47" />
22+
<package id="System.Linq" version="4.3.0" targetFramework="net47" />
23+
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net47" />
24+
<package id="System.Reflection" version="4.3.0" targetFramework="net47" />
25+
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net47" />
26+
<package id="System.Reflection.Metadata" version="1.2.0" targetFramework="net47" />
27+
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net47" />
28+
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net47" />
29+
<package id="System.Runtime" version="4.3.0" targetFramework="net47" />
30+
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net47" />
31+
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net47" />
32+
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net47" />
33+
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net47" />
34+
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net47" />
35+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net47" />
36+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net47" />
37+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net47" />
38+
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net47" />
39+
<package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net47" />
40+
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net47" />
41+
<package id="System.Threading" version="4.3.0" targetFramework="net47" />
42+
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net47" />
43+
<package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net47" />
44+
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net47" />
45+
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net47" />
46+
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net47" />
47+
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net47" />
48+
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net47" />
49+
<package id="System.Xml.XPath.XDocument" version="4.3.0" targetFramework="net47" />
5050
</packages>

0 commit comments

Comments
 (0)