Skip to content

Commit 2be2ccf

Browse files
author
Matt Cohn
committed
Merge branch 'master' into netcore
Conflicts: src/dir.props
2 parents c948089 + 79bd7c9 commit 2be2ccf

File tree

70 files changed

+21677
-64
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+21677
-64
lines changed

‎dir.props‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,66 @@
2929
<BuildToolsTargetInputs>$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)build.proj</BuildToolsTargetInputs>
3030
<BuildToolsTargetOutputs>$(BuildToolsInstallSemaphore)</BuildToolsTargetOutputs>
3131
</PropertyGroup>
32+
33+
<!-- Set default Configuration and Platform -->
34+
<PropertyGroup>
35+
<Configuration Condition="'$(Configuration)' ==''">Debug</Configuration>
36+
<Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
37+
</PropertyGroup>
38+
39+
<!-- Setup Default symbol and optimization for Configuration -->
40+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
41+
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
42+
<Optimize Condition="'$(Optimize)' == ''">false</Optimize>
43+
<DebugType Condition="'$(DebugType)' == ''">full</DebugType>
44+
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
45+
</PropertyGroup>
46+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
47+
<DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
48+
<Optimize Condition="'$(Optimize)' == ''">true</Optimize>
49+
<DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType>
50+
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
51+
</PropertyGroup>
52+
53+
<!-- Disable some standard properties for building our projects -->
54+
<PropertyGroup>
55+
<NoStdLib>true</NoStdLib>
56+
<NoExplicitReferenceToStdLib>true</NoExplicitReferenceToStdLib>
57+
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
58+
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
59+
</PropertyGroup>
60+
61+
<!-- Setup some common paths -->
62+
<PropertyGroup>
63+
<CommonPath>$(SourceDir)Common\src</CommonPath>
64+
<CommonTestPath>$(SourceDir)Common\tests</CommonTestPath>
65+
</PropertyGroup>
66+
67+
<!-- Setup the default output and intermediate paths -->
68+
<PropertyGroup>
69+
<BaseOutputPath>$(ProjectDir)bin\</BaseOutputPath>
70+
<BaseOutputPathWithConfig>$(BaseOutputPath)$(Configuration)\</BaseOutputPathWithConfig>
71+
<BaseOutputPathWithConfig Condition="'$(Platform)' != 'AnyCPU'">$(BaseOutputPath)$(Platform)\$(Configuration)\</BaseOutputPathWithConfig>
72+
<OutputPath>$(BaseOutputPathWithConfig)$(MSBuildProjectName)\</OutputPath>
73+
74+
<BaseIntermediateOutputPath>$(BaseOutputPath)obj\</BaseIntermediateOutputPath>
75+
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(MSBuildProjectName)\$(Configuration)\</IntermediateOutputPath>
76+
<IntermediateOutputPath Condition="'$(Platform)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(MSBuildProjectName)\$(Configuration)\$(Platform)\</IntermediateOutputPath>
77+
78+
<TestPath>$(TestWorkingDir)$(MSBuildProjectName)\$(Configuration)\</TestPath>
79+
<TestPath Condition="'$(Platform)' != 'AnyCPU'">$(TestWorkingDir)$(MSBuildProjectName)\$(Configuration)\$(Platform)\</TestPath>
80+
</PropertyGroup>
81+
82+
<PropertyGroup>
83+
<!-- Work around known Dev14 bug - see
84+
https://connect.microsoft.com/VisualStudio/feedback/details/1000796/connect-file-uap-props-not-found-cant-build-a-portable-lib-on-vs14
85+
-->
86+
<_WindowsKitBinPath>$(MSBuildProgramFiles32)\Windows Kits\8.1\bin\x86</_WindowsKitBinPath>
87+
<_WindowsPhoneKitBinPath>$(MSBuildProgramFiles32)\Windows Phone Kits\8.1\bin</_WindowsPhoneKitBinPath>
88+
<MakePriExeFullPath>$(_WindowsKitBinPath)\makepri.exe</MakePriExeFullPath>
89+
<MakeAppxExeFullPath>$(_WindowsKitBinPath)\makeappx.exe</MakeAppxExeFullPath>
90+
<SignAppxPackageExeFullPath>$(_WindowsKitBinPath)\signtool.exe</SignAppxPackageExeFullPath>
91+
<MakePriExtensionPath>$(_WindowsPhoneKitBinPath)\x86\MrmEnvironmentExtDl.dll</MakePriExtensionPath>
92+
<MakePriExtensionPath_x64>$(_WindowsPhoneKitBinPath)\x64\MrmEnvironmentExtDl.dll</MakePriExtensionPath_x64>
93+
</PropertyGroup>
3294
</Project>

‎src/System.Collections.Concurrent.sln‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.30723.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent", "System.Collections.Concurrent\src\System.Collections.Concurrent.csproj", "{96AA2060-C846-4E56-9509-E8CB9C114C8F}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Collections.Concurrent.Tests", "System.Collections.Concurrent\tests\System.Collections.Concurrent.Tests.csproj", "{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XunitTraitsDiscoverers", "Common\tests\XunitTraitsDiscoverers\XunitTraitsDiscoverers.csproj", "{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}"
11+
EndProject
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{47919FF5-DA40-4D99-AF2D-F560282AA913}"
13+
ProjectSection(SolutionItems) = preProject
14+
.nuget\packages.config = .nuget\packages.config
15+
EndProjectSection
16+
EndProject
17+
Global
18+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
19+
Debug|Any CPU = Debug|Any CPU
20+
Release|Any CPU = Release|Any CPU
21+
EndGlobalSection
22+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23+
{96AA2060-C846-4E56-9509-E8CB9C114C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{96AA2060-C846-4E56-9509-E8CB9C114C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{96AA2060-C846-4E56-9509-E8CB9C114C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{96AA2060-C846-4E56-9509-E8CB9C114C8F}.Release|Any CPU.Build.0 = Release|Any CPU
27+
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{9574CEEC-5554-411B-B44C-6CA9EC1CEB08}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{BE8ED8C1-C314-4C4E-A929-64C9C8B3552A}.Release|Any CPU.Build.0 = Release|Any CPU
35+
EndGlobalSection
36+
GlobalSection(SolutionProperties) = preSolution
37+
HideSolutionNode = FALSE
38+
EndGlobalSection
39+
EndGlobal

‎src/System.Collections.Concurrent/src/Properties/AssemblyInfo.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright (c) Microsoft. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.Reflection;
6+
using System.Resources;
7+
using System.Runtime.InteropServices;
8+
9+
// General Information about an assembly is controlled through the following
10+
// set of attributes. Change these attribute values to modify the information
11+
// associated with an assembly.
12+
13+
[assembly: AssemblyCopyright("\x00a9 Microsoft Corporation. All rights reserved.")]
14+
[assembly: AssemblyCompany("Microsoft Corporation")]
15+
[assembly: AssemblyFileVersion("999.999.999.0")]
16+
[assembly: AssemblyInformationalVersion("999.999.999.0")]
17+
[assembly: AssemblyVersion("999.999.999.0")]
18+
19+
[assembly: AssemblyTitle("System.Collections.Concurrent")]
20+
[assembly: AssemblyDescription("")]
21+
[assembly: AssemblyConfiguration("")]
22+
[assembly: AssemblyProduct("System.Collections.Concurrent")]
23+
[assembly: AssemblyTrademark("")]
24+
[assembly: AssemblyCulture("")]
25+
[assembly: NeutralResourcesLanguageAttribute("en-US")]
26+
27+
[assembly: ComVisible(false)]
28+
[assembly: CLSCompliant(true)]

0 commit comments

Comments
 (0)