diff options
| author | Santiago Fernandez Madero <safern@microsoft.com> | 2017-10-24 04:24:28 +0300 |
|---|---|---|
| committer | Dan Moseley <danmose@microsoft.com> | 2017-10-24 04:24:28 +0300 |
| commit | bcc59b2e74090cfbcc4d6e7c245c172744e9d46b (patch) | |
| tree | 569aa387154f5ffd7e6f9351941e82ba6bf88de9 /src/System.Memory | |
| parent | 389d7ee0630e71ff868b4d9ebcdcf8111d5acee3 (diff) | |
Fix System.Data.Odbc configurations for support package and run UpdateVSConfigurations (#24752)
* Fixed odbc configurations for compat package
* Run UpdateVSConfigurations
* Remove Default Configurations to help VS... comment from csproj's
* Remove from System.Buffers as well
Diffstat (limited to 'src/System.Memory')
| -rw-r--r-- | src/System.Memory/System.Memory.sln | 16 | ||||
| -rw-r--r-- | src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj | 5 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/System.Memory/System.Memory.sln b/src/System.Memory/System.Memory.sln index 15d7f65e81..402cbd12a0 100644 --- a/src/System.Memory/System.Memory.sln +++ b/src/System.Memory/System.Memory.sln @@ -31,14 +31,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU - {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU - {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Release|Any CPU.Build.0 = Release|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {15DB0DCC-68B4-4CFB-8BD2-F26BCCAF5A3F}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU + {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU + {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU + {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU + {18482C55-6B57-41E8-BBC4-383B9E2C7AA2}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU {4BBC8F69-D03E-4432-AA8A-D458FA5B235A}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU diff --git a/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj b/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj index d80176c328..493b7421ae 100644 --- a/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj +++ b/src/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj @@ -5,9 +5,8 @@ <IncludePerformanceTests>true</IncludePerformanceTests> <ProjectGuid>{18482C55-6B57-41E8-BBC4-383B9E2C7AA2}</ProjectGuid> </PropertyGroup> - <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Perf.Span.BinaryReadAndWrite.cs" /> <Compile Include="Perf.Span.Clear.cs" /> |