diff --git a/build/Antlr4.Runtime.nuspec b/build/Antlr4.Runtime.nuspec index 0a3ac6954..2f463734a 100644 --- a/build/Antlr4.Runtime.nuspec +++ b/build/Antlr4.Runtime.nuspec @@ -20,29 +20,29 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + diff --git a/build/Antlr4.VS2008.nuspec b/build/Antlr4.VS2008.nuspec index 975c3df3f..0f8246e8e 100644 --- a/build/Antlr4.VS2008.nuspec +++ b/build/Antlr4.VS2008.nuspec @@ -27,8 +27,8 @@ - - - + + + diff --git a/build/Antlr4.nuspec b/build/Antlr4.nuspec index a82b2d8ca..d608755c4 100644 --- a/build/Antlr4.nuspec +++ b/build/Antlr4.nuspec @@ -27,8 +27,8 @@ - - - + + + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net20.csproj similarity index 93% rename from runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj rename to runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net20.csproj index 14054fe22..61d956120 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v2.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net20.csproj @@ -17,7 +17,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - obj\v2.0\ + obj\net20\ ..\ true @@ -25,8 +25,8 @@ true full false - bin\v2.0\Debug\ - DEBUG;TRACE + bin\net20\Debug\ + DEBUG;TRACE;NET20;NET20PLUS prompt 4 true @@ -34,8 +34,8 @@ pdbonly true - bin\v2.0\Release\ - TRACE + bin\net20\Release\ + TRACE;NET20;NET20PLUS prompt 4 true @@ -66,9 +66,9 @@ - + {e1a46d9d-66cb-46e8-93b0-7fc87299abef} - Antlr4.Runtime.v2.0 + Antlr4.Runtime.net20 @@ -77,7 +77,7 @@ - + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net30.csproj similarity index 93% rename from runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj rename to runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net30.csproj index 559397e61..ba625ad89 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net30.csproj @@ -17,7 +17,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - obj\v3.0\ + obj\net30\ ..\ true @@ -25,8 +25,8 @@ true full false - bin\v3.0\Debug\ - DEBUG;TRACE + bin\net30\Debug\ + DEBUG;TRACE;NET30;NET30PLUS;NET20PLUS prompt 4 true @@ -34,8 +34,8 @@ pdbonly true - bin\v3.0\Release\ - TRACE + bin\net30\Release\ + TRACE;NET30;NET30PLUS;NET20PLUS prompt 4 true @@ -66,9 +66,9 @@ - + {ebbdcc35-43cc-416c-860b-9fc115f1eb42} - Antlr4.Runtime.v3.0 + Antlr4.Runtime.net30 @@ -77,7 +77,7 @@ - + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj similarity index 92% rename from runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj rename to runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj index da3a3fb32..cddaa77f0 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v3.5.csproj +++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net35-client.csproj @@ -17,7 +17,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - obj\v3.5\ + obj\net35\ ..\ true @@ -25,8 +25,8 @@ true full false - bin\v3.5\Debug\ - DEBUG;TRACE;NET_3_5 + bin\net35\Debug\ + DEBUG;TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -34,8 +34,8 @@ pdbonly true - bin\v3.5\Release\ - TRACE;NET_3_5 + bin\net35\Release\ + TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -66,9 +66,9 @@ - + {e186fda3-1411-47ee-94c7-9f3745f0474b} - Antlr4.Runtime.v3.5 + Antlr4.Runtime.net35-client @@ -77,7 +77,7 @@ - + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net40-client.csproj similarity index 92% rename from runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj rename to runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net40-client.csproj index 1086dd8e0..3ee96696a 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net40-client.csproj @@ -17,7 +17,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - obj\v4.0\ + obj\net40\ ..\ true @@ -25,8 +25,8 @@ true full false - bin\v4.0\Debug\ - DEBUG;TRACE;NET_3_5;NET_4_0 + bin\net40\Debug\ + DEBUG;TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -34,8 +34,8 @@ pdbonly true - bin\v4.0\Release\ - TRACE;NET_3_5;NET_4_0 + bin\net40\Release\ + TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -67,9 +67,9 @@ - + {423978df-85a4-409e-a16c-453683fe3969} - Antlr4.Runtime.v4.0 + Antlr4.Runtime.net40-client @@ -78,7 +78,7 @@ - + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net45.csproj similarity index 92% rename from runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj rename to runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net45.csproj index c48bed3c2..455616915 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.v4.5.csproj +++ b/runtime/CSharp/Antlr4.Runtime.Test/Antlr4.Runtime.Test.net45.csproj @@ -17,7 +17,7 @@ $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False UnitTest - obj\v4.5\ + obj\net45\ ..\ true @@ -25,8 +25,8 @@ true full false - bin\v4.5\Debug\ - DEBUG;TRACE;NET_3_5;NET_4_0;NET_4_5 + bin\net45\Debug\ + DEBUG;TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -34,8 +34,8 @@ pdbonly true - bin\v4.5\Release\ - TRACE;NET_3_5;NET_4_0;NET_4_5 + bin\net45\Release\ + TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 true @@ -67,9 +67,9 @@ - + {e1d192de-5347-48c4-a9f4-a8cba2af3869} - Antlr4.Runtime.v4.5 + Antlr4.Runtime.net45 @@ -78,7 +78,7 @@ - + diff --git a/runtime/CSharp/Antlr4.Runtime.Test/BaseTest.cs b/runtime/CSharp/Antlr4.Runtime.Test/BaseTest.cs index d8c442395..186e7215c 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/BaseTest.cs +++ b/runtime/CSharp/Antlr4.Runtime.Test/BaseTest.cs @@ -71,7 +71,7 @@ { get { -#if NET_4_0 +#if NET40PLUS return Environment.GetFolderPath(Environment.SpecialFolder.Windows); #else string systemFolder = Environment.GetFolderPath(Environment.SpecialFolder.System); @@ -84,7 +84,7 @@ { get { -#if NET_4_0 +#if NET40PLUS return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); #else string documentsFolder = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); @@ -95,7 +95,7 @@ protected static string PathCombine(params string[] paths) { -#if NET_4_0 +#if NET40PLUS return Path.Combine(paths); #else string result = paths[0]; @@ -225,7 +225,7 @@ get { string javaKey = "SOFTWARE\\JavaSoft\\Java Runtime Environment"; -#if NET_4_0 +#if NET40PLUS using (var baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Default).OpenSubKey(javaKey)) #else using (var baseKey = Registry.LocalMachine.OpenSubKey(javaKey)) diff --git a/runtime/CSharp/Antlr4.Runtime.Test/TestPerformance.cs b/runtime/CSharp/Antlr4.Runtime.Test/TestPerformance.cs index 3961cc1d6..fff09a2e4 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/TestPerformance.cs +++ b/runtime/CSharp/Antlr4.Runtime.Test/TestPerformance.cs @@ -24,7 +24,7 @@ using StreamReader = System.IO.StreamReader; using Thread = System.Threading.Thread; -#if NET_4_0 +#if NET40PLUS using System.Collections.Concurrent; using System.Threading.Tasks; using System.Threading.Tasks.Schedulers; @@ -386,7 +386,7 @@ int sourceCount = 0; int inputSize = 0; -#if NET_4_0 +#if NET40PLUS BlockingCollection threadIdentifiers = new BlockingCollection(); for (int i = 0; i < NUMBER_OF_THREADS; i++) threadIdentifiers.Add(i); @@ -402,7 +402,7 @@ sourceCount++; input.Seek(0); inputSize += input.Size; -#if NET_4_0 +#if NET40PLUS Task futureChecksum = Task.Factory.StartNew(new Callable_1(input, factory, threadIdentifiers).call, CancellationToken.None, TaskCreationOptions.None, executorService); #else Func futureChecksum = new Callable_1(input, factory).call; @@ -413,7 +413,7 @@ Checksum checksum = new CRC32(); foreach (var future in results) { -#if NET_4_0 +#if NET40PLUS int value = future.Result; #else int value = future(); @@ -424,7 +424,7 @@ } } -#if NET_4_0 +#if NET40PLUS executorServiceHost.Dispose(); #endif @@ -592,11 +592,11 @@ { private readonly ICharStream input; private readonly ParserFactory factory; -#if NET_4_0 +#if NET40PLUS private readonly BlockingCollection threadNumbers; #endif -#if NET_4_0 +#if NET40PLUS public Callable_1(ICharStream input, ParserFactory factory, BlockingCollection threadNumbers) #else public Callable_1(ICharStream input, ParserFactory factory) @@ -604,7 +604,7 @@ { this.input = input; this.factory = factory; -#if NET_4_0 +#if NET40PLUS this.threadNumbers = threadNumbers; #endif } @@ -613,7 +613,7 @@ { // this incurred a great deal of overhead and was causing significant variations in performance results. //Console.Out.WriteLine("Parsing file {0}", input.getSourceName()); -#if NET_4_0 +#if NET40PLUS int threadNumber = threadNumbers.Take(); #else int threadNumber = 0; @@ -624,7 +624,7 @@ } finally { -#if NET_4_0 +#if NET40PLUS threadNumbers.Add(threadNumber); #endif } diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net20.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v2.0.config rename to runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net20.config diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net30.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.0.config rename to runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net30.config diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config similarity index 76% rename from runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config rename to runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config index 3435f261c..5ad135965 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v3.5.config +++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net35-client.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net40-client.config similarity index 76% rename from runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config rename to runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net40-client.config index 2e734cdcf..a69ecb556 100644 --- a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.0.config +++ b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net40-client.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config b/runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net45.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.v4.5.config rename to runtime/CSharp/Antlr4.Runtime.Test/packages.Antlr4.Runtime.Test.net45.config diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v2.0.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net20.csproj similarity index 97% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v2.0.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net20.csproj index 1c78a0052..1a72f6420 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v2.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net20.csproj @@ -9,10 +9,10 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.v2.0 + Antlr4.Runtime.net20 v2.0 512 - obj\v2.0\ + obj\net20\ ..\ true @@ -20,9 +20,9 @@ true full false - bin\v2.0\Debug\ + bin\net20\Debug\ $(OutputPath)$(AssemblyName).xml - DEBUG;TRACE;NET_2_0 + DEBUG;TRACE;NET20;NET20PLUS prompt 4 1591 @@ -30,9 +30,9 @@ pdbonly true - bin\v2.0\Release\ + bin\net20\Release\ $(OutputPath)$(AssemblyName).xml - TRACE;NET_2_0 + TRACE;NET20;NET20PLUS prompt 4 1591 @@ -243,7 +243,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.0.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net30.csproj similarity index 96% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.0.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net30.csproj index aa5b1692e..ca20a02f1 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net30.csproj @@ -9,10 +9,10 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.v3.0 + Antlr4.Runtime.net30 v3.0 512 - obj\v3.0\ + obj\net30\ ..\ true @@ -20,9 +20,9 @@ true full false - bin\v3.0\Debug\ + bin\net30\Debug\ $(OutputPath)$(AssemblyName).xml - DEBUG;TRACE;NET_2_0;NET_3_0 + DEBUG;TRACE;NET30;NET30PLUS;NET20PLUS prompt 4 1591 @@ -30,9 +30,9 @@ pdbonly true - bin\v3.0\Release\ + bin\net30\Release\ $(OutputPath)$(AssemblyName).xml - TRACE;NET_2_0;NET_3_0 + TRACE;NET30;NET30PLUS;NET20PLUS prompt 4 1591 @@ -243,7 +243,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.CF3.5.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-cf.csproj similarity index 95% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.CF3.5.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-cf.csproj index 8c6ac7f49..354c19541 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.CF3.5.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-cf.csproj @@ -10,18 +10,18 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.CF3.5 + Antlr4.Runtime.net35-cf {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} WindowsCE E2BECB1F-8C8C-41ba-B736-9BE7D946A398 5.0 - Antlr4.Runtime.CF3.5 + Antlr4.Runtime.net35-cf v3.5 Windows CE 512 - obj\CF3.5\ + obj\net35-cf\ ..\ true @@ -29,9 +29,9 @@ true full false - bin\CF3.5\Debug\ + bin\net35-cf\Debug\ $(OutputPath)\$(AssemblyName).xml - DEBUG;TRACE;$(PlatformFamilyName);NET_CF;NET_2_0;NET_3_0;NET_3_5 + DEBUG;TRACE;$(PlatformFamilyName);COMPACT;NET35;NET35PLUS;NET30PLUS;NET20PLUS true true prompt @@ -43,9 +43,9 @@ pdbonly true - bin\CF3.5\Release\ + bin\net35-cf\Release\ $(OutputPath)\$(AssemblyName).xml - TRACE;$(PlatformFamilyName);NET_CF;NET_2_0;NET_3_0;NET_3_5 + TRACE;$(PlatformFamilyName);COMPACT;NET35;NET35PLUS;NET30PLUS;NET20PLUS true true prompt @@ -262,7 +262,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.5.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-client.csproj similarity index 96% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.5.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-client.csproj index 980f6396d..cc6045db3 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v3.5.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net35-client.csproj @@ -9,10 +9,11 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.v3.5 + Antlr4.Runtime.net35 v3.5 + Client 512 - obj\v3.5\ + obj\net35-client\ ..\ true @@ -20,9 +21,9 @@ true full false - bin\v3.5\Debug\ + bin\net35-client\Debug\ $(OutputPath)$(AssemblyName).xml - DEBUG;TRACE;NET_2_0;NET_3_0;NET_3_5 + DEBUG;TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -30,9 +31,9 @@ pdbonly true - bin\v3.5\Release\ + bin\net35-client\Release\ $(OutputPath)$(AssemblyName).xml - TRACE;NET_2_0;NET_3_0;NET_3_5 + TRACE;NET35;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -242,7 +243,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.0.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net40-client.csproj similarity index 95% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.0.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net40-client.csproj index d2f7dfcb3..1dd4c76bf 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.0.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net40-client.csproj @@ -9,10 +9,11 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.v4.0 + Antlr4.Runtime.net40 v4.0 + Client 512 - obj\v4.0\ + obj\net40-client\ ..\ true @@ -20,9 +21,9 @@ true full false - bin\v4.0\Debug\ + bin\net40-client\Debug\ $(OutputPath)$(AssemblyName).xml - TRACE;DEBUG;NET_2_0;NET_3_0;NET_3_5;NET_4_0 + TRACE;DEBUG;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -30,9 +31,9 @@ pdbonly true - bin\v4.0\Release\ + bin\net40-client\Release\ $(OutputPath)$(AssemblyName).xml - TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0 + TRACE;NET40;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -236,7 +237,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.5.csproj b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net45.csproj similarity index 96% rename from runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.5.csproj rename to runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net45.csproj index 8f1220c85..2f313ea7c 100644 --- a/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.v4.5.csproj +++ b/runtime/CSharp/Antlr4.Runtime/Antlr4.Runtime.net45.csproj @@ -9,10 +9,10 @@ Library Properties Antlr4.Runtime - Antlr4.Runtime.v4.5 + Antlr4.Runtime.net45 v4.5 512 - obj\v4.5\ + obj\net45\ ..\ true @@ -20,9 +20,9 @@ true full false - bin\v4.5\Debug\ + bin\net45\Debug\ $(OutputPath)$(AssemblyName).xml - TRACE;DEBUG;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5 + TRACE;DEBUG;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -30,9 +30,9 @@ pdbonly true - bin\v4.5\Release\ + bin\net45\Release\ $(OutputPath)$(AssemblyName).xml - TRACE;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5 + TRACE;NET45;NET45PLUS;NET40PLUS;NET35PLUS;NET30PLUS;NET20PLUS prompt 4 1591 @@ -236,7 +236,7 @@ - + MSBuild:Compile Antlr4.Runtime.Tree.Xpath diff --git a/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs b/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs index 6d806c2ee..cfb768966 100644 --- a/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs +++ b/runtime/CSharp/Antlr4.Runtime/AntlrFileStream.cs @@ -36,7 +36,7 @@ using File = System.IO.File; namespace Antlr4.Runtime { -#if NET_CF +#if COMPACT using StreamReader = System.IO.StreamReader; #endif @@ -72,7 +72,7 @@ namespace Antlr4.Runtime } string text; -#if !NET_CF +#if !COMPACT if (encoding != null) text = File.ReadAllText(fileName, encoding); else @@ -96,7 +96,7 @@ namespace Antlr4.Runtime } } -#if NET_CF +#if COMPACT private static string ReadAllText(string path) { using (var reader = new StreamReader(path)) diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs b/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs index e0e896098..b39f21c87 100644 --- a/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs +++ b/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfig.cs @@ -394,7 +394,7 @@ namespace Antlr4.Runtime.Atn public virtual string ToDotString() { -#if NET_CF +#if COMPACT throw new NotImplementedException("The current platform does not provide RuntimeHelpers.GetHashCode(object)."); #else StringBuilder builder = new StringBuilder(); diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs b/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs index b6bbc7a84..2d7dcaa9c 100644 --- a/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs +++ b/runtime/CSharp/Antlr4.Runtime/Atn/SemanticContext.cs @@ -580,7 +580,7 @@ namespace Antlr4.Runtime.Atn Collections.EmptyList(); List result = collection.OfType().ToList(); -#if NET_4_0 +#if NET40PLUS collection.ExceptWith(result); #else collection.ExceptWith(result.Cast()); diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs index 9ecca29f0..921eb41de 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs @@ -103,7 +103,7 @@ namespace Antlr4.Runtime.Dfa get; } -#if NET_4_5 +#if NET45PLUS public abstract IReadOnlyDictionary ToMap(); #else public abstract IDictionary ToMap(); diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs index 052a8bb2c..b974b32cd 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/ArrayEdgeMap`1.cs @@ -167,7 +167,7 @@ namespace Antlr4.Runtime.Dfa return this; } -#if NET_4_5 +#if NET45PLUS public override IReadOnlyDictionary ToMap() #else public override IDictionary ToMap() @@ -178,7 +178,7 @@ namespace Antlr4.Runtime.Dfa return Sharpen.Collections.EmptyMap(); } -#if NET_CF +#if COMPACT IDictionary result = new SortedList(); #else IDictionary result = new SortedDictionary(); @@ -191,7 +191,7 @@ namespace Antlr4.Runtime.Dfa } result[i + minIndex] = arrayData[i]; } -#if NET_4_5 +#if NET45PLUS return new ReadOnlyDictionary(result); #else return result; diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs index 1b80e1434..388f737c8 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/DFAState.cs @@ -208,7 +208,7 @@ namespace Antlr4.Runtime.Dfa } } -#if NET_4_5 +#if NET45PLUS public virtual IReadOnlyDictionary EdgeMap #else public virtual IDictionary EdgeMap @@ -256,7 +256,7 @@ namespace Antlr4.Runtime.Dfa } } -#if NET_4_5 +#if NET45PLUS public virtual IReadOnlyDictionary ContextEdgeMap #else public virtual IDictionary ContextEdgeMap @@ -277,16 +277,16 @@ namespace Antlr4.Runtime.Dfa } else { -#if NET_4_5 +#if NET45PLUS Dictionary result = map.ToDictionary(i => i.Key, i => i.Value); #else Dictionary result = new Dictionary(map); #endif result.Add(PredictionContext.EmptyFullStateKey, result[-1]); result.Remove(-1); -#if NET_4_5 +#if NET45PLUS map = new ReadOnlyDictionary(new SortedDictionary(result)); -#elif NET_CF +#elif COMPACT map = new SortedList(result); #else map = new SortedDictionary(result); diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap`1.cs index 4f18070c7..a679fdf46 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/IEdgeMap`1.cs @@ -66,7 +66,7 @@ namespace Antlr4.Runtime.Dfa [return: NotNull] IEdgeMap Clear(); -#if NET_4_5 +#if NET45PLUS [return: NotNull] IReadOnlyDictionary ToMap(); #else diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs index ced47c453..0a7b826cd 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/SingletonEdgeMap`1.cs @@ -150,7 +150,7 @@ namespace Antlr4.Runtime.Dfa return this; } -#if NET_4_5 +#if NET45PLUS public override IReadOnlyDictionary ToMap() #else public override IDictionary ToMap() diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs index 85b845a3b..df79a63ae 100644 --- a/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Dfa/SparseEdgeMap`1.cs @@ -196,7 +196,7 @@ namespace Antlr4.Runtime.Dfa return result; } -#if NET_4_5 +#if NET45PLUS public override IReadOnlyDictionary ToMap() #else public override IDictionary ToMap() @@ -207,7 +207,7 @@ namespace Antlr4.Runtime.Dfa return Sharpen.Collections.EmptyMap(); } -#if NET_CF +#if COMPACT IDictionary result = new SortedList(); #else IDictionary result = new SortedDictionary(); @@ -216,7 +216,7 @@ namespace Antlr4.Runtime.Dfa { result[keys[i]] = values[i]; } -#if NET_4_5 +#if NET45PLUS return new ReadOnlyDictionary(result); #else return result; diff --git a/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener`1.cs b/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener`1.cs index b01518f8d..6e8d10d27 100644 --- a/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/IAntlrErrorListener`1.cs @@ -34,7 +34,7 @@ namespace Antlr4.Runtime { /// How to emit recognition errors. /// How to emit recognition errors. -#if NET_CF +#if COMPACT public interface IAntlrErrorListener #else public interface IAntlrErrorListener diff --git a/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs b/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs index 3487775cd..511fcf839 100644 --- a/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs +++ b/runtime/CSharp/Antlr4.Runtime/Misc/ParseCanceledException.cs @@ -48,7 +48,7 @@ namespace Antlr4.Runtime.Misc [System.Serializable] #endif public class ParseCanceledException -#if NET_CF +#if COMPACT : Exception #else : OperationCanceledException diff --git a/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs b/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs index 5df005e14..2a3862eed 100644 --- a/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs +++ b/runtime/CSharp/Antlr4.Runtime/Misc/RuleDependencyChecker.cs @@ -341,7 +341,7 @@ namespace Antlr4.Runtime.Misc foreach (MethodInfo method in clazz.GetMethods(AllDeclaredMembers)) { GetElementDependencies(AsCustomAttributeProvider(method), result); -#if NET_CF +#if COMPACT if (method.ReturnTypeCustomAttributes != null) GetElementDependencies(AsCustomAttributeProvider(method.ReturnTypeCustomAttributes), result); #else diff --git a/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs b/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs index 856123349..7968d1783 100644 --- a/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs +++ b/runtime/CSharp/Antlr4.Runtime/Misc/Utils.cs @@ -39,7 +39,7 @@ namespace Antlr4.Runtime.Misc { public static string Join(string separator, IEnumerable items) { -#if NET_4_0 +#if NET40PLUS return string.Join(separator, items); #else List elements = new List(); diff --git a/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs b/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs index db03da848..e8ddfa83f 100644 --- a/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs +++ b/runtime/CSharp/Antlr4.Runtime/ParserRuleContext.cs @@ -284,7 +284,7 @@ namespace Antlr4.Runtime return null; } -#if NET_4_5 +#if NET45PLUS public virtual IReadOnlyList GetTokens(int ttype) #else public virtual ITerminalNode[] GetTokens(int ttype) @@ -315,7 +315,7 @@ namespace Antlr4.Runtime { return Collections.EmptyList(); } -#if NET_4_5 +#if NET45PLUS return tokens; #else return tokens.ToArray(); @@ -328,7 +328,7 @@ namespace Antlr4.Runtime return GetChild(i); } -#if NET_4_5 +#if NET45PLUS public virtual IReadOnlyList GetRuleContexts() where T : Antlr4.Runtime.ParserRuleContext #else @@ -356,7 +356,7 @@ namespace Antlr4.Runtime { return Collections.EmptyList(); } -#if NET_4_5 +#if NET45PLUS return contexts; #else return contexts.ToArray(); diff --git a/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs b/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs index ffd421f17..0e7801156 100644 --- a/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs +++ b/runtime/CSharp/Antlr4.Runtime/Properties/AssemblyInfo.cs @@ -37,16 +37,16 @@ using System.Runtime.InteropServices; // associated with an assembly. #if PORTABLE [assembly: AssemblyTitle("Antlr4.Runtime.Portable")] -#elif NET_4_5 -[assembly: AssemblyTitle("Antlr4.Runtime.v4.5")] -#elif NET_4_0 -[assembly: AssemblyTitle("Antlr4.Runtime.v4.0")] -#elif NET_3_5 -[assembly: AssemblyTitle("Antlr4.Runtime.v3.5")] -#elif NET_3_0 -[assembly: AssemblyTitle("Antlr4.Runtime.v3.0")] -#elif NET_2_0 -[assembly: AssemblyTitle("Antlr4.Runtime.v2.0")] +#elif NET45 +[assembly: AssemblyTitle("Antlr4.Runtime.net45")] +#elif NET40 +[assembly: AssemblyTitle("Antlr4.Runtime.net40")] +#elif NET35 +[assembly: AssemblyTitle("Antlr4.Runtime.net35")] +#elif NET30 +[assembly: AssemblyTitle("Antlr4.Runtime.net30")] +#elif NET20 +[assembly: AssemblyTitle("Antlr4.Runtime.net20")] #else #error Unknown assembly. #endif @@ -78,7 +78,7 @@ using System.Runtime.InteropServices; // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("4.2.0.0")] -#if !NET_CF +#if !COMPACT [assembly: AssemblyFileVersion("4.2.2.0")] [assembly: AssemblyInformationalVersion("4.2.2-dev")] #endif diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs index 80e6888f1..f6d3f642f 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Collections.cs @@ -39,7 +39,7 @@ namespace Antlr4.Runtime.Sharpen return EmptyListImpl.Instance; } -#if NET_4_5 +#if NET45PLUS public static ReadOnlyDictionary EmptyMap() #else public static IDictionary EmptyMap() @@ -53,13 +53,13 @@ namespace Antlr4.Runtime.Sharpen return new ReadOnlyCollection(new T[] { item }); } -#if NET_4_5 +#if NET45PLUS public static ReadOnlyDictionary SingletonMap(TKey key, TValue value) #else public static IDictionary SingletonMap(TKey key, TValue value) #endif { -#if NET_4_5 +#if NET45PLUS return new ReadOnlyDictionary(new Dictionary { { key, value } }); #else return new Dictionary { { key, value } }; @@ -73,7 +73,7 @@ namespace Antlr4.Runtime.Sharpen private static class EmptyMapImpl { -#if NET_4_5 +#if NET45PLUS public static readonly ReadOnlyDictionary Instance = new ReadOnlyDictionary(new Dictionary()); #else diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/CollectionDebuggerView`2.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/CollectionDebuggerView`2.cs index 2ee185ec9..ad3aaf5c6 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/CollectionDebuggerView`2.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/CollectionDebuggerView`2.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Collections.Generic; @@ -46,7 +46,7 @@ namespace Antlr4.Runtime.Sharpen this.c = col; } -#if !NET_CF +#if !COMPACT [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)] #endif public T[] Items { @@ -67,7 +67,7 @@ namespace Antlr4.Runtime.Sharpen this.c = col; } -#if !NET_CF +#if !COMPACT [DebuggerBrowsable (DebuggerBrowsableState.RootHidden)] #endif public KeyValuePair[] Items { diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ConcurrentDictionary`2.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ConcurrentDictionary`2.cs index 7ad6e2abf..9ad47a83b 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ConcurrentDictionary`2.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ConcurrentDictionary`2.cs @@ -22,7 +22,7 @@ // // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Threading; @@ -38,7 +38,7 @@ namespace System.Collections.Concurrent namespace Antlr4.Runtime.Sharpen { -#if !NET_CF +#if !COMPACT [DebuggerDisplay ("Count={Count}")] [DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))] #endif diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Enumerable.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Enumerable.cs index 8411fdfbe..dc9b5f756 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Enumerable.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Enumerable.cs @@ -1,4 +1,4 @@ -#if !NET_3_5 +#if !NET35PLUS namespace System.Linq { diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ExtensionAttribute.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ExtensionAttribute.cs index e125f2716..fedde2b8c 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ExtensionAttribute.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/ExtensionAttribute.cs @@ -1,4 +1,4 @@ -#if !NET_3_5 +#if !NET35PLUS namespace System.Runtime.CompilerServices { diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Funcs.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Funcs.cs index 19d5a6f47..9b1c974b6 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Funcs.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Funcs.cs @@ -25,7 +25,7 @@ // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // -#if !NET_3_5 +#if !NET35PLUS using System.Runtime.CompilerServices; diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/HashSet`1.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/HashSet`1.cs index 3b88d45b5..65c442231 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/HashSet`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/HashSet`1.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_3_5 || NET_CF +#if !NET35PLUS || COMPACT using System; using System.Collections; @@ -42,12 +42,12 @@ using System.Diagnostics; namespace Antlr4.Runtime.Sharpen { [Serializable] -#if !NET_CF +#if !COMPACT [DebuggerDisplay ("Count={Count}")] [DebuggerTypeProxy (typeof (CollectionDebuggerView<,>))] #endif public class HashSet : ICollection -#if !NET_CF +#if !COMPACT , ISerializable, IDeserializationCallback #endif { @@ -86,7 +86,7 @@ namespace Antlr4.Runtime.Sharpen { int threshold; IEqualityComparer comparer; -#if !NET_CF +#if !COMPACT SerializationInfo si; #endif @@ -127,7 +127,7 @@ namespace Antlr4.Runtime.Sharpen { Add (item); } -#if !NET_CF +#if !COMPACT protected HashSet (SerializationInfo info, StreamingContext context) { si = info; @@ -579,7 +579,7 @@ namespace Antlr4.Runtime.Sharpen { return setComparer; } -#if !NET_CF +#if !COMPACT [SecurityPermission (SecurityAction.LinkDemand, Flags = SecurityPermissionFlag.SerializationFormatter)] public virtual void GetObjectData (SerializationInfo info, StreamingContext context) { diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralComparable.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralComparable.cs index 99de4158c..0f6b37205 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralComparable.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralComparable.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Collections; diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralEquatable.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralEquatable.cs index 66d8c7e2f..7e8cb1605 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralEquatable.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/IStructuralEquatable.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Collections; diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/SplitOrderedList`2.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/SplitOrderedList`2.cs index bd5882068..6a0a80b47 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/SplitOrderedList`2.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/SplitOrderedList`2.cs @@ -22,7 +22,7 @@ // // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Threading; @@ -438,7 +438,7 @@ namespace Antlr4.Runtime.Sharpen while ((rwlock & (RwWrite | RwWait)) > 0) sw.SpinOnce (); -#if NET_CF +#if COMPACT if ((InterlockedAdd (ref rwlock, RwRead) & (RwWait | RwWait)) == 0) return; @@ -454,7 +454,7 @@ namespace Antlr4.Runtime.Sharpen public void ExitReadLock () { -#if NET_CF +#if COMPACT InterlockedAdd (ref rwlock, -RwRead); #else Interlocked.Add (ref rwlock, -RwRead); @@ -482,14 +482,14 @@ namespace Antlr4.Runtime.Sharpen public void ExitWriteLock () { -#if NET_CF +#if COMPACT InterlockedAdd (ref rwlock, -RwWrite); #else Interlocked.Add (ref rwlock, -RwWrite); #endif } -#if NET_CF +#if COMPACT /// /// Adds two 32-bit integers and replaces the first integer with the sum, as an atomic operation. /// @@ -521,7 +521,7 @@ namespace Antlr4.Runtime.Sharpen // The number of step until SpinOnce yield on multicore machine const int step = 10; const int maxTime = 200; -#if !NET_CF +#if !COMPACT static readonly bool isSingleCpu = (Environment.ProcessorCount == 1); #endif @@ -530,7 +530,7 @@ namespace Antlr4.Runtime.Sharpen public void SpinOnce () { ntime += 1; -#if NET_CF +#if COMPACT Thread.Sleep(0); #else if (isSingleCpu) { diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuple.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuple.cs index ed1b4288d..ae7979d40 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuple.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuple.cs @@ -26,7 +26,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_4_0 +#if !NET40PLUS using System; diff --git a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuples.cs b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuples.cs index 3872dc8e7..dda3a9cce 100644 --- a/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuples.cs +++ b/runtime/CSharp/Antlr4.Runtime/Sharpen/Compat/Tuples.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_4_0 +#if !NET40PLUS using System; using System.Collections; diff --git a/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor`1.cs b/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor`1.cs index 3e436694a..b1c45ccad 100644 --- a/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor`1.cs +++ b/runtime/CSharp/Antlr4.Runtime/Tree/IParseTreeVisitor`1.cs @@ -43,7 +43,7 @@ namespace Antlr4.Runtime.Tree /// . /// /// Sam Harwell -#if NET_CF +#if COMPACT public interface IParseTreeVisitor #else public interface IParseTreeVisitor diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v2.0.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net20.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v2.0.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net20.config diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.0.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net30.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.0.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net30.config diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.CF3.5.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-cf.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.CF3.5.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-cf.config diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.5.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-client.config similarity index 76% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.5.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-client.config index 3435f261c..5ad135965 100644 --- a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v3.5.config +++ b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net35-client.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.0.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net40-client.config similarity index 76% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.0.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net40-client.config index 2e734cdcf..a69ecb556 100644 --- a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.0.config +++ b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net40-client.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.5.config b/runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net45.config similarity index 100% rename from runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.v4.5.config rename to runtime/CSharp/Antlr4.Runtime/packages.Antlr4.Runtime.net45.config diff --git a/runtime/CSharp/Antlr4.VS2008.sln b/runtime/CSharp/Antlr4.VS2008.sln index 6880e1018..6f666dc70 100644 --- a/runtime/CSharp/Antlr4.VS2008.sln +++ b/runtime/CSharp/Antlr4.VS2008.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.CF3.5", "Antlr4.Runtime\Antlr4.Runtime.CF3.5.csproj", "{C5F9C476-200F-4440-9524-C5C3F9BE16D7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net35-cf", "Antlr4.Runtime\Antlr4.Runtime.net35-cf.csproj", "{C5F9C476-200F-4440-9524-C5C3F9BE16D7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/runtime/CSharp/Antlr4.sln b/runtime/CSharp/Antlr4.sln index 37a24aaae..7c7d23e45 100644 --- a/runtime/CSharp/Antlr4.sln +++ b/runtime/CSharp/Antlr4.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.30110.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v4.5", "Antlr4.Runtime\Antlr4.Runtime.v4.5.csproj", "{E1D192DE-5347-48C4-A9F4-A8CBA2AF3869}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net45", "Antlr4.Runtime\Antlr4.Runtime.net45.csproj", "{E1D192DE-5347-48C4-A9F4-A8CBA2AF3869}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47C0086D-577C-43DA-ADC7-544F27656E45}" ProjectSection(SolutionItems) = preProject @@ -16,31 +16,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\reference\sharpen.md = ..\..\reference\sharpen.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v4.5", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v4.5.csproj", "{9D8C43DF-71F9-4CC9-83AD-A39FAEBCECA0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net45", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net45.csproj", "{9D8C43DF-71F9-4CC9-83AD-A39FAEBCECA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.v4.0", "Antlr4BuildTasks\Antlr4BuildTasks.v4.0.csproj", "{F63DFE80-AE1F-47A6-A31A-E39DA4C837BA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.net40", "Antlr4BuildTasks\Antlr4BuildTasks.net40.csproj", "{F63DFE80-AE1F-47A6-A31A-E39DA4C837BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v4.0", "Antlr4.Runtime\Antlr4.Runtime.v4.0.csproj", "{423978DF-85A4-409E-A16C-453683FE3969}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net40-client", "Antlr4.Runtime\Antlr4.Runtime.net40-client.csproj", "{423978DF-85A4-409E-A16C-453683FE3969}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v3.5", "Antlr4.Runtime\Antlr4.Runtime.v3.5.csproj", "{E186FDA3-1411-47EE-94C7-9F3745F0474B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net35-client", "Antlr4.Runtime\Antlr4.Runtime.net35-client.csproj", "{E186FDA3-1411-47EE-94C7-9F3745F0474B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v3.0", "Antlr4.Runtime\Antlr4.Runtime.v3.0.csproj", "{EBBDCC35-43CC-416C-860B-9FC115F1EB42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net30", "Antlr4.Runtime\Antlr4.Runtime.net30.csproj", "{EBBDCC35-43CC-416C-860B-9FC115F1EB42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.v2.0", "Antlr4.Runtime\Antlr4.Runtime.v2.0.csproj", "{E1A46D9D-66CB-46E8-93B0-7FC87299ABEF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.net20", "Antlr4.Runtime\Antlr4.Runtime.net20.csproj", "{E1A46D9D-66CB-46E8-93B0-7FC87299ABEF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v4.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v4.0.csproj", "{706D364A-CD4E-4720-B94C-0DB82AF7B433}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net40-client", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net40-client.csproj", "{706D364A-CD4E-4720-B94C-0DB82AF7B433}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v3.5", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v3.5.csproj", "{C4A38390-8AA3-45AE-9A70-C392146B37D0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net35-client", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net35-client.csproj", "{C4A38390-8AA3-45AE-9A70-C392146B37D0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v3.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v3.0.csproj", "{8A2F2331-A4A5-4C7F-8D5D-DEECEF54AEA7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net30", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net30.csproj", "{8A2F2331-A4A5-4C7F-8D5D-DEECEF54AEA7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.v2.0", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.v2.0.csproj", "{0A4681C4-1248-4ACD-B59F-D6CC17CC2B4C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.net20", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.net20.csproj", "{0A4681C4-1248-4ACD-B59F-D6CC17CC2B4C}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Portable", "Antlr4.Runtime\Antlr4.Runtime.Portable.csproj", "{06C182C5-095C-4D43-9C33-C87E305C6BC2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4.Runtime.Test.Portable", "Antlr4.Runtime.Test\Antlr4.Runtime.Test.Portable.csproj", "{97C32E42-51B2-4A29-B005-769B63CFEFCA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.v3.5", "Antlr4BuildTasks\Antlr4BuildTasks.v3.5.csproj", "{0D3D20E9-3341-4449-80E7-76A4534F0E55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Antlr4BuildTasks.net35", "Antlr4BuildTasks\Antlr4BuildTasks.net35.csproj", "{0D3D20E9-3341-4449-80E7-76A4534F0E55}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4CE79A54-058D-4940-875E-7F6AA9922A7D}" ProjectSection(SolutionItems) = preProject diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.props b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.props similarity index 85% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.props rename to runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.props index 2e5af46db..6af7c80c1 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.props +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.props @@ -1,7 +1,7 @@  - + . ..\tools\antlr4-csharp-4.2.2-SNAPSHOT-complete.jar diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.targets b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.targets similarity index 97% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.targets rename to runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.targets index c9cf79eae..2775592f1 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v3.5.targets +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net35.targets @@ -30,7 +30,7 @@ MSBuild 4.0.0.0 eb42632606e9261f - Antlr4BuildTasks.v3.5, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken) + Antlr4BuildTasks.net35, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken) @@ -61,7 +61,7 @@ - + diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.props b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.props similarity index 85% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.props rename to runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.props index 0a62d0e86..bb60705d6 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.props +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.props @@ -1,7 +1,7 @@  - + . ..\tools\antlr4-csharp-4.2.2-SNAPSHOT-complete.jar diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.targets b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets similarity index 97% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.targets rename to runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets index a96c1bd51..e34b4363e 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4.v4.0.targets +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4.net40.targets @@ -30,7 +30,7 @@ MSBuild 4.0.0.0 eb42632606e9261f - Antlr4BuildTasks.v4.0, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken) + Antlr4BuildTasks.net40, Version=$(TaskVersion), Culture=neutral, PublicKeyToken=$(TaskKeyToken) @@ -59,7 +59,7 @@ - + diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v3.5.csproj b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net35.csproj similarity index 87% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v3.5.csproj rename to runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net35.csproj index 61151ff5e..5d0d2692b 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v3.5.csproj +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net35.csproj @@ -8,17 +8,17 @@ Library Properties Antlr4.Build.Tasks - Antlr4BuildTasks.v3.5 + Antlr4BuildTasks.net35 v3.5 512 - obj\v3.5\ + obj\net35\ true full false - bin\v3.5\Debug\ - DEBUG;TRACE + bin\net35\Debug\ + DEBUG;TRACE;NET35;NET35PLUS prompt 4 ExtendedDesignGuidelineRules.ruleset @@ -26,8 +26,8 @@ pdbonly true - bin\v3.5\Release\ - TRACE + bin\net35\Release\ + TRACE;NET35;NET35PLUS prompt 4 @@ -56,10 +56,10 @@ - + Always - + Always Designer diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v4.0.csproj b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net40.csproj similarity index 87% rename from runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v4.0.csproj rename to runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net40.csproj index f27c2b6da..7d77c6b89 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.v4.0.csproj +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.net40.csproj @@ -8,17 +8,17 @@ Library Properties Antlr4.Build.Tasks - Antlr4BuildTasks.v4.0 + Antlr4BuildTasks.net40 v4.0 512 - obj\v4.0\ + obj\net40\ true full false - bin\v4.0\Debug\ - DEBUG;TRACE;NET_4_0 + bin\net40\Debug\ + DEBUG;TRACE;NET40;NET40PLUS;NET35PLUS prompt 4 ExtendedDesignGuidelineRules.ruleset @@ -26,8 +26,8 @@ pdbonly true - bin\v4.0\Release\ - TRACE;NET_4_0 + bin\net40\Release\ + TRACE;NET40;NET40PLUS;NET35PLUS prompt 4 @@ -57,10 +57,10 @@ - + Always - + Always Designer diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs index 0832b4876..d9ff3ff37 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs +++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTaskInternal.cs @@ -37,7 +37,7 @@ namespace Antlr4.Build.Tasks using System.Text.RegularExpressions; using RegistryHive = Microsoft.Win32.RegistryHive; using RegistryKey = Microsoft.Win32.RegistryKey; -#if NET_4_0 +#if NET40PLUS using RegistryView = Microsoft.Win32.RegistryView; #else using Registry = Microsoft.Win32.Registry; @@ -156,7 +156,7 @@ namespace Antlr4.Build.Tasks } } -#if NET_4_0 +#if NET40PLUS private string JavaHome { get diff --git a/runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs b/runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs index 2d1d62a0b..7cb840723 100644 --- a/runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs +++ b/runtime/CSharp/Antlr4BuildTasks/Properties/AssemblyInfo.cs @@ -35,12 +35,14 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -#if NET_4_0 -[assembly: AssemblyTitle("Antlr4BuildTasks.v4.0")] -[assembly: AssemblyProduct("Antlr4BuildTasks.v4.0")] +#if NET40 +[assembly: AssemblyTitle("Antlr4BuildTasks.net40")] +[assembly: AssemblyProduct("Antlr4BuildTasks.net40")] +#elif NET35 +[assembly: AssemblyTitle("Antlr4BuildTasks.net35")] +[assembly: AssemblyProduct("Antlr4BuildTasks.net35")] #else -[assembly: AssemblyTitle("Antlr4BuildTasks.v3.5")] -[assembly: AssemblyProduct("Antlr4BuildTasks.v3.5")] +#error Unknown assembly. #endif [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")]