Przeglądaj źródła

Revert "Adding C# 8.0 build flavors to prototype with new language features."

This reverts commit 4054bcec72f4d143994966958fab2f7f00016be7.
Oren Novotny 6 lat temu
rodzic
commit
11b2225f8b

+ 0 - 3
Ix.NET/Source/Directory.build.targets

@@ -10,9 +10,6 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
     <DefineConstants>$(DefineConstants);NO_ARRAY_EMPTY;NO_TASK_FROMEXCEPTION</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug_CSharp8' OR '$(Configuration)' == 'Release_CSharp8'">
-    <DefineConstants>$(DefineConstants);CSHARP8</DefineConstants>
-  </PropertyGroup>
 
   <PropertyGroup>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>

+ 2 - 36
Ix.NET/Source/Ix.Async.NET.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28407.52
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{87534290-A7A6-47A4-9A3A-D0D21A9AD1D4}"
 EndProject
@@ -37,74 +37,40 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Async.Pr
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_CSharp8|Any CPU = Debug_CSharp8|Any CPU
 		Debug|Any CPU = Debug|Any CPU
-		Release_CSharp8|Any CPU = Release_CSharp8|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}.Release|Any CPU.Build.0 = Release|Any CPU
-		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{172BD8C4-5C3E-4928-9D3F-746CF336FFEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B1E5420-E8F3-4B5F-A11A-4D18578F50CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{513F9ABD-4FB8-4AC1-89DA-C3300399F34C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E23D7AD-0B21-4725-87C4-BD43271260A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{134E9066-6217-4AF0-B408-47D92AB595BD}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{134E9066-6217-4AF0-B408-47D92AB595BD}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{134E9066-6217-4AF0-B408-47D92AB595BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{134E9066-6217-4AF0-B408-47D92AB595BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{134E9066-6217-4AF0-B408-47D92AB595BD}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{134E9066-6217-4AF0-B408-47D92AB595BD}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{134E9066-6217-4AF0-B408-47D92AB595BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{134E9066-6217-4AF0-B408-47D92AB595BD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Debug_CSharp8|Any CPU.ActiveCfg = Debug_CSharp8|Any CPU
-		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Debug_CSharp8|Any CPU.Build.0 = Debug_CSharp8|Any CPU
 		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Release_CSharp8|Any CPU.ActiveCfg = Release_CSharp8|Any CPU
-		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Release_CSharp8|Any CPU.Build.0 = Release_CSharp8|Any CPU
 		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{974056C0-91BD-4EB6-8431-E30A614FD1D4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

+ 0 - 1
Ix.NET/Source/System.Interactive.Async.Providers.Tests/System.Interactive.Async.Providers.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
 

+ 0 - 1
Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.csproj

@@ -5,7 +5,6 @@
     <AssemblyTitle>Interactive Extensions - Async Providers Library</AssemblyTitle>
     <TargetFrameworks>net45;net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
   <ItemGroup>

+ 0 - 1
Ix.NET/Source/System.Interactive.Async.Tests/System.Interactive.Async.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
 

+ 0 - 1
Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.csproj

@@ -5,7 +5,6 @@
     <AssemblyTitle>Interactive Extensions - Async Library</AssemblyTitle>
     <TargetFrameworks>net45;net46;netstandard1.4;netstandard2.0</TargetFrameworks>
     <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
   <ItemGroup>

+ 0 - 1
Ix.NET/Source/System.Linq.Async.Queryable.Tests/System.Linq.Async.Queryable.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
 

+ 0 - 1
Ix.NET/Source/System.Linq.Async.Queryable/System.Linq.Async.Queryable.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;net46;netstandard1.4;netstandard2.0</TargetFrameworks>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
   <ItemGroup>

+ 0 - 1
Ix.NET/Source/System.Linq.Async.Tests/System.Linq.Async.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
     <NoWarn>$(NoWarn);CS0618</NoWarn>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
 

+ 0 - 1
Ix.NET/Source/System.Linq.Async/System.Linq.Async.csproj

@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>net45;net46;netstandard1.4;netstandard2.0</TargetFrameworks>
-    <Configurations>Debug;Release;Debug_CSharp8;Release_CSharp8</Configurations>
   </PropertyGroup>
 
   <ItemGroup>