Skip to content

Commit

Permalink
Change .csproj to new Configurations property
Browse files Browse the repository at this point in the history 
Change .sln to use the managed C# project system GUID.


Commit migrated from dotnet/corefx@e05508a
  • Loading branch information
@eerhardt
eerhardt committed Jun 28, 2018
1 parent 2003fd3 commit 8b6d5ba
Show file tree
Hide file tree
Showing 839 changed files with 2,348 additions and 4,118 deletions.
5 changes: 1 addition & 4 deletions src/libraries/Common/perf/PerfRunner/PerfRunner.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
<CopyNuGetImplementations>false</CopyNuGetImplementations>
<NoWarn>0436</NoWarn>
<IsTestProject>true</IsTestProject>
<Configurations>netstandard-Debug;netstandard-Release;netstandard1.3-Debug;netstandard1.3-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="PerfRunner.cs" />
</ItemGroup>
Expand Down
9 changes: 3 additions & 6 deletions src/libraries/Common/tests/Common.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,8 @@
<ProjectGuid>{C72FD34C-539A-4447-9796-62A229571199}</ProjectGuid>
<TestCategories>InnerLoop;OuterLoop</TestCategories>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
Expand Down Expand Up @@ -79,7 +76,7 @@
<Compile Include="Tests\System\Security\IdentityHelperTests.cs" />
<Compile Include="Tests\System\Text\ValueStringBuilderTests.cs" />
<Compile Include="Tests\System\SpanTestHelpers.cs" />
<Compile Include="Tests\System\StringExtensions.Tests.cs" />
<Compile Include="Tests\System\StringExtensions.Tests.cs" />
<Compile Include="Tests\System\StringTests.cs" />
<Compile Include="Tests\System\Collections\Generic\ArrayBuilderTests.cs" />
<Compile Include="Tests\System\Collections\Generic\LargeArrayBuilderTests.cs" />
Expand Down Expand Up @@ -110,7 +107,7 @@
<Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
<Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
</Compile>
<Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
<Compile Include="Tests\System\IO\PathInternal.Windows.Tests.cs" />
<Compile Include="$(CommonPath)\CoreLib\Interop\Windows\Kernel32\Interop.FormatMessage.cs">
<Link>Common\Interop\Windows\kernel32\Interop.FormatMessage.cs</Link>
</Compile>
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/Common/tests/Performance/Common.Performance.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<IncludePerformanceTests>true</IncludePerformanceTests>
<ProjectGuid>{B96198F5-9BF7-42DE-83E8-3EE39DA25F43}</ProjectGuid>
<DisableTests Condition="'$(TargetGroup)' == 'uap' AND ('$(ArchGroup)' == 'arm' OR '$(ArchGroup)' == 'arm64')">true</DisableTests>
<Configurations>netcoreapp-Debug;netcoreapp-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<ItemGroup Condition="'$(DisableTests)' != 'true'">
<Compile Include="$(CommonPath)\System\Marvin.cs">
<Link>Common\System\Marvin.cs</Link>
Expand Down
3 changes: 1 addition & 2 deletions .../Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<AssemblyName>RemoteExecutorConsoleApp</AssemblyName>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<CopyNuGetImplementations>false</CopyNuGetImplementations>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="RemoteExecutorConsoleApp.cs" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/Common/tests/System/Xml/BaseLibManaged/BaseLibManaged.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<PropertyGroup>
<ProjectGuid>{42F10363-C2A2-42B5-B7B9-1B5DBB0BC71E}</ProjectGuid>
<RootNamespace>WebData.BaseLib</RootNamespace>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="Globalization.cs" />
<Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs">
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{3CF0CC76-4CE0-460A-BA37-657CFED39AB0}</ProjectGuid>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="cattrbase.cs" />
<Compile Include="ccommon.cs" />
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/Common/tests/System/Xml/XmlCoreTest/XmlCoreTest.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<ProjectGuid>{89701565-F68B-46D9-BD78-95B0F052C50B}</ProjectGuid>
<AssemblyName>XmlCoreTest</AssemblyName>
<RootNamespace>XmlCoreTest.Common</RootNamespace>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="AsyncUtil.cs" />
<Compile Include="CustomWriter.cs" />
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/Common/tests/System/Xml/XmlDiff/XmlDiff.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<ProjectGuid>{466D87DF-BDEC-4E6C-BACD-317D79B8EDBE}</ProjectGuid>
<AssemblyName>XmlDiff</AssemblyName>
<RootNamespace>System.Xml.XmlDiff</RootNamespace>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="XmlDiff.cs" />
<Compile Include="XmlDiffDocument.cs" />
Expand Down
13 changes: 8 additions & 5 deletions src/libraries/CoreFx.Private.TestUtilities/CoreFx.Private.TestUtilities.sln
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27213.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreFx.Private.TestUtilities.Tests", "tests\CoreFx.Private.TestUtilities.Tests.csproj", "{5E0DB390-A45E-41BE-8304-B840327FE597}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreFx.Private.TestUtilities.Tests", "tests\CoreFx.Private.TestUtilities.Tests.csproj", "{5E0DB390-A45E-41BE-8304-B840327FE597}"
ProjectSection(ProjectDependencies) = postProject
{EBDB0247-CA43-4226-B7A1-8FEF21061D09} = {EBDB0247-CA43-4226-B7A1-8FEF21061D09}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreFx.Private.TestUtilities", "src\CoreFx.Private.TestUtilities.csproj", "{EBDB0247-CA43-4226-B7A1-8FEF21061D09}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreFx.Private.TestUtilities", "src\CoreFx.Private.TestUtilities.csproj", "{EBDB0247-CA43-4226-B7A1-8FEF21061D09}"
ProjectSection(ProjectDependencies) = postProject
{E2E59C98-998F-9965-991D-99411166AF6F} = {E2E59C98-998F-9965-991D-99411166AF6F}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreFx.Private.TestUtilities", "ref\CoreFx.Private.TestUtilities.csproj", "{E2E59C98-998F-9965-991D-99411166AF6F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreFx.Private.TestUtilities", "ref\CoreFx.Private.TestUtilities.csproj", "{E2E59C98-998F-9965-991D-99411166AF6F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Expand Down Expand Up @@ -47,4 +47,7 @@ Global
{EBDB0247-CA43-4226-B7A1-8FEF21061D09} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{E2E59C98-998F-9965-991D-99411166AF6F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6EDCA7D5-885F-44E6-9098-1396FD41C96E}
EndGlobalSection
EndGlobal
3 changes: 1 addition & 2 deletions src/libraries/CoreFx.Private.TestUtilities/ref/CoreFx.Private.TestUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<ShouldWriteSigningRequired>false</ShouldWriteSigningRequired>
<AllowReferenceFromRuntime>true</AllowReferenceFromRuntime>
<RuntimeProjectFile>$(ProjectDir)\external\test-runtime\XUnit.Runtime.depproj</RuntimeProjectFile>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="CoreFx.Private.TestUtilities.cs" />
<ReferenceFromRuntime Include="xunit.core" />
Expand Down
19 changes: 2 additions & 17 deletions src/libraries/CoreFx.Private.TestUtilities/src/CoreFx.Private.TestUtilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,8 @@
<EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
<NoWarn Condition="'$(TargetGroup)' == 'netstandard'">$(NoWarn);CS3021</NoWarn>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetGroup)' == 'netstandard'">Test Utilities are not supported on this platform</GeneratePlatformNotSupportedAssemblyMessage>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp2.0-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uapaot-Windows_NT-Release|AnyCPU'" />
<Configurations>netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.0-Unix-Debug;netcoreapp2.0-Unix-Release;netcoreapp2.0-Windows_NT-Debug;netcoreapp2.0-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uapaot-Windows_NT-Debug;uapaot-Windows_NT-Release</Configurations>
</PropertyGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netstandard'">
<Compile Include="System\AdminHelpers.cs" />
<Compile Include="System\IO\FileCleanupTestBase.cs" />
Expand Down
3 changes: 1 addition & 2 deletions src/libraries/CoreFx.Private.TestUtilities/tests/CoreFx.Private.TestUtilities.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{5E0DB390-A45E-41BE-8304-B840327FE597}</ProjectGuid>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" />
<PropertyGroup>
<RootNamespace>CoreFx.Private.TestUtilities.Tests</RootNamespace>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/libraries/Directory.Build.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
</ItemGroup>
</Target>

<PropertyGroup>
<!--
Hack workaround to skip the GenerateCompiledExpressionsTempFile target in
Microsoft.WorkflowBuildExtensions.targets target that always runs in VS
-->
<GenerateCompiledExpressionsTempFilePathForEditing></GenerateCompiledExpressionsTempFilePathForEditing>
</PropertyGroup>

<!--
Hack workaround for not restoring each project. Instead, we turn off all the targets
that require a `project.assets.json`, since ours will be empty anyway.
Expand Down
13 changes: 8 additions & 5 deletions src/libraries/Microsoft.CSharp/Microsoft.CSharp.sln
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27213.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp.Tests", "tests\Microsoft.CSharp.Tests.csproj", "{82B54697-0251-47A1-8546-FC507D0F3B08}"
ProjectSection(ProjectDependencies) = postProject
{96AA2060-C846-4E56-9509-E8CB9C114C8F} = {96AA2060-C846-4E56-9509-E8CB9C114C8F}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "src\Microsoft.CSharp.csproj", "{96AA2060-C846-4E56-9509-E8CB9C114C8F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "src\Microsoft.CSharp.csproj", "{96AA2060-C846-4E56-9509-E8CB9C114C8F}"
ProjectSection(ProjectDependencies) = postProject
{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {1427906B-FF3D-422A-8278-F2B7E89DE12A}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CSharp", "ref\Microsoft.CSharp.csproj", "{1427906B-FF3D-422A-8278-F2B7E89DE12A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CSharp", "ref\Microsoft.CSharp.csproj", "{1427906B-FF3D-422A-8278-F2B7E89DE12A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Expand Down Expand Up @@ -47,4 +47,7 @@ Global
{96AA2060-C846-4E56-9509-E8CB9C114C8F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
{1427906B-FF3D-422A-8278-F2B7E89DE12A} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {89BC0057-5CFB-4B4B-B255-A5EDB54CFEAE}
EndGlobalSection
EndGlobal
3 changes: 1 addition & 2 deletions src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
Can be removed when API is added and this assembly is versioned to 4.1.* -->
<AssemblyVersion>4.0.0.0</AssemblyVersion>
<ProjectGuid>{1427906B-FF3D-422A-8278-F2B7E89DE12A}</ProjectGuid>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="Microsoft.CSharp.cs" />
</ItemGroup>
Expand Down
5 changes: 2 additions & 3 deletions src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
<RootNamespace>Microsoft.CSharp</RootNamespace>
<!-- dotnet/corefx#3128 tracks removing this exclusion -->
<ExcludeLocalizationImport Condition="'$(TargetsWindows)' != 'true'">true</ExcludeLocalizationImport>
<Configurations>netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="Microsoft\CSharp\RuntimeBinder\ArgumentObject.cs" />
<Compile Include="Microsoft\CSharp\RuntimeBinder\Binder.cs" />
Expand Down Expand Up @@ -179,4 +178,4 @@
<Reference Include="System.Runtime.InteropServices" />
<Reference Include="System.Threading" />
</ItemGroup>
</Project>
</Project>
5 changes: 1 addition & 4 deletions src/libraries/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
<PropertyGroup>
<ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release</Configurations>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="AccessTests.cs" />
<Compile Include="ArrayHandling.cs" />
Expand Down
11 changes: 7 additions & 4 deletions ...agnostics.Tracing.EventSource.Redist/Microsoft.Diagnostics.Tracing.EventSource.Redist.sln
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.27213.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{0657A043-0AEE-445E-9BE4-0B3A9D80318F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests", "tests\Microsoft.Diagnostics.Tracing.EventSource.Redist.Tests.csproj", "{0657A043-0AEE-445E-9BE4-0B3A9D80318F}"
ProjectSection(ProjectDependencies) = postProject
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist", "src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj", "{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Tracing.EventSource.Redist", "src\Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj", "{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{1A2F9F4A-A032-433E-B914-ADD5992BB178}"
EndProject
Expand Down Expand Up @@ -35,4 +35,7 @@ Global
{0657A043-0AEE-445E-9BE4-0B3A9D80318F} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {53827F58-3CA5-4CEF-9176-70DD35463C1E}
EndGlobalSection
EndGlobal
3 changes: 1 addition & 2 deletions ...cs.Tracing.EventSource.Redist/src/Microsoft.Diagnostics.Tracing.EventSource.Redist.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
<AssemblyName>Microsoft.Diagnostics.Tracing.EventSource</AssemblyName>
<ProjectGuid>{0CAF38F5-C7E7-46F2-8F39-C5D57492FF7F}</ProjectGuid>
<DefineConstants Condition="'$(TargetGroup)' == 'netfx'">$(DefineConstants);NO_EVENTCOMMANDEXECUTED_SUPPORT;ES_BUILD_STANDALONE;FEATURE_MANAGED_ETW;PLATFORM_WINDOWS</DefineConstants>
<Configurations>netfx-Windows_NT-Debug;netfx-Windows_NT-Release</Configurations>
</PropertyGroup>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
</PropertyGroup>
<!-- Default configurations to help VS understand the options -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netfx-Windows_NT-Release|AnyCPU'" />
<ItemGroup>
<Compile Include="..\..\System.Diagnostics.Tracing\src\System\Diagnostics\Tracing\EventCounter.cs" />
<Compile Include="*.cs" />
Expand Down
Loading

0 comments on commit 8b6d5ba

Please sign in to comment.