Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 1f1d240

Browse files
dsplaisteddsplaisted
committed
Update System.Composition projects to build in corefx
1 parent 1c3415a commit 1f1d240

File tree

32 files changed

+2517
-297
lines changed

32 files changed

+2517
-297
lines changed

‎src/System.Composition.AttributedModel/src/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
// General Information about an assembly is controlled through the following
1010
// set of attributes. Change these attribute values to modify the information
1111
// associated with an assembly.
12-
[assembly: AssemblyTitle("System.Composition.AttributedModel")]
13-
[assembly: AssemblyDescription("")]
1412
[assembly: AssemblyConfiguration("")]
15-
[assembly: AssemblyProduct("System.Composition.AttributedModel")]
1613
[assembly: AssemblyTrademark("")]
1714
[assembly: AssemblyCulture("")]
1815
[assembly: NeutralResourcesLanguage("en")]

‎src/System.Composition.AttributedModel/src/System.Composition.AttributedModel.csproj‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
55
<PropertyGroup>
@@ -8,31 +8,16 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>System.Composition</RootNamespace>
1010
<AssemblyName>System.Composition.AttributedModel</AssemblyName>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1113
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1214
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1315
<RestorePackages>true</RestorePackages>
14-
<SccProjectName>SAK</SccProjectName>
15-
<SccLocalPath>SAK</SccLocalPath>
16-
<SccAuxPath>SAK</SccAuxPath>
17-
<SccProvider>SAK</SccProvider>
1816
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
1917
</PropertyGroup>
2018
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
25-
<DocumentationFile>bin\Debug\System.Composition.AttributedModel.XML</DocumentationFile>
2619
</PropertyGroup>
2720
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<OutputPath>bin\Release\</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
32-
<DocumentationFile>bin\Release\System.Composition.AttributedModel.XML</DocumentationFile>
33-
</PropertyGroup>
34-
<PropertyGroup>
35-
<ExternallyShipping>true</ExternallyShipping>
3621
</PropertyGroup>
3722
<ItemGroup>
3823
<!-- A reference to the entire .NET Framework is automatically included -->
@@ -61,4 +46,4 @@
6146
<Target Name="AfterBuild">
6247
</Target>
6348
-->
64-
</Project>
49+
</Project>

‎src/System.Composition.AttributedModel/src/System/Composition/SharingBoundaryAttribute.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ namespace System.Composition
1919
/// <seealso cref="SharedAttribute" />
2020
[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property, Inherited = false)]
2121
[MetadataAttribute]
22+
[CLSCompliant(false)]
2223
public sealed class SharingBoundaryAttribute : Attribute
2324
{
2425
private readonly string[] _sharingBoundaryNames;

‎src/System.Composition.Convention/src/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@
99
// General Information about an assembly is controlled through the following
1010
// set of attributes. Change these attribute values to modify the information
1111
// associated with an assembly.
12-
[assembly: AssemblyTitle("System.Composition.Conventions")]
13-
[assembly: AssemblyDescription("")]
1412
[assembly: AssemblyConfiguration("")]
15-
[assembly: AssemblyProduct("System.Composition.Conventions")]
1613
[assembly: AssemblyTrademark("")]
1714
[assembly: AssemblyCulture("")]
1815
[assembly: NeutralResourcesLanguage("en")]

‎src/System.Composition.Convention/src/System.Composition.Convention.csproj‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
55
<PropertyGroup>
@@ -8,30 +8,17 @@
88
<AppDesignerFolder>Properties</AppDesignerFolder>
99
<RootNamespace>System.Composition.Convention</RootNamespace>
1010
<AssemblyName>System.Composition.Convention</AssemblyName>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1113
<FileAlignment>512</FileAlignment>
1214
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1315
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1416
<RestorePackages>true</RestorePackages>
15-
<ExternallyShipping>true</ExternallyShipping>
16-
<SccProjectName>SAK</SccProjectName>
17-
<SccLocalPath>SAK</SccLocalPath>
18-
<SccAuxPath>SAK</SccAuxPath>
19-
<SccProvider>SAK</SccProvider>
2017
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
2118
</PropertyGroup>
2219
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27-
<DocumentationFile>bin\Debug\System.Composition.Convention.xml</DocumentationFile>
2820
</PropertyGroup>
2921
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<OutputPath>bin\Release\</OutputPath>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
34-
<DocumentationFile>bin\Release\System.Composition.Convention.xml</DocumentationFile>
3522
</PropertyGroup>
3623
<ItemGroup>
3724
<Compile Include="Microsoft\Composition\Diagnostics\CompositionTrace.cs" />
@@ -78,4 +65,4 @@
7865
<Target Name="AfterBuild">
7966
</Target>
8067
-->
81-
</Project>
68+
</Project>

‎src/System.Composition.Convention/tests/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,11 @@
88
// General Information about an assembly is controlled through the following
99
// set of attributes. Change these attribute values to modify the information
1010
// associated with an assembly.
11-
[assembly: AssemblyTitle("ConventionsUnitTests")]
12-
[assembly: AssemblyDescription("")]
1311
[assembly: AssemblyConfiguration("")]
14-
[assembly: AssemblyProduct("ConventionsUnitTests")]
1512
[assembly: AssemblyTrademark("")]
1613
[assembly: AssemblyCulture("")]
1714

1815
// Setting ComVisible to false makes the types in this assembly not visible
1916
// to COM components. If you need to access a type in this assembly from
2017
// COM, set the ComVisible attribute to true on that type.
2118
[assembly: ComVisible(false)]
22-
23-
// The following GUID is for the ID of the typelib if this project is exposed to COM
24-
[assembly: Guid("402b1e70-e9d4-447b-bec6-dd1005bfbf33")]

‎src/System.Composition.Convention/tests/System.Composition.Convention.UnitTests.csproj‎ renamed to ‎src/System.Composition.Convention/tests/System.Composition.Convention.Tests.csproj‎

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,26 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" />
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
53
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
64
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
75
<PropertyGroup>
86
<ProjectGuid>{853BB14F-8A5B-42B4-A053-21DE1AEBB335}</ProjectGuid>
97
<OutputType>Library</OutputType>
108
<AppDesignerFolder>Properties</AppDesignerFolder>
119
<RootNamespace>ConventionsUnitTests</RootNamespace>
12-
<AssemblyName>Sytem.Composition.Convention.UnitTests</AssemblyName>
13-
<TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
14-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
15-
<TargetFrameworkProfile>
16-
</TargetFrameworkProfile>
10+
<AssemblyName>System.Composition.Convention.Tests</AssemblyName>
1711
<FileAlignment>512</FileAlignment>
1812
<ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1913
<TestProjectType>UnitTest</TestProjectType>
2014
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
2115
<RestorePackages>true</RestorePackages>
22-
<SccProjectName>SAK</SccProjectName>
23-
<SccLocalPath>SAK</SccLocalPath>
24-
<SccAuxPath>SAK</SccAuxPath>
25-
<SccProvider>SAK</SccProvider>
26-
<ExternallyShipping>false</ExternallyShipping>
27-
<NuGetPackageImportStamp>9b9cb493</NuGetPackageImportStamp>
2816
</PropertyGroup>
2917
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
30-
<OutputPath>bin\Debug\</OutputPath>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
3318
</PropertyGroup>
3419
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
35-
<OutputPath>bin\Release\</OutputPath>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
3820
</PropertyGroup>
3921
<ItemGroup>
40-
<Reference Include="System" />
41-
<Reference Include="xunit.abstractions">
42-
<HintPath>..\..\..\packages\xunit.abstractions.2.0.0-beta5-build2785\lib\net35\xunit.abstractions.dll</HintPath>
43-
</Reference>
44-
<Reference Include="xunit.assert">
45-
<HintPath>..\..\..\packages\xunit.assert.2.0.0-beta5-build2785\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monoandroid+monotouch10\xunit.assert.dll</HintPath>
46-
</Reference>
47-
<Reference Include="xunit.core">
48-
<HintPath>..\..\..\packages\xunit.core.2.0.0-beta5-build2785\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.core.dll</HintPath>
49-
</Reference>
22+
<None Include="project.json" />
5023
</ItemGroup>
51-
<Choose>
52-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
53-
<ItemGroup>
54-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
55-
</ItemGroup>
56-
</When>
57-
<Otherwise>
58-
<ItemGroup>
59-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
60-
</ItemGroup>
61-
</Otherwise>
62-
</Choose>
6324
<ItemGroup>
6425
<Compile Include="..\..\System.Composition\tests\Util\AssertX.cs">
6526
<Link>Util\AssertX.cs</Link>
@@ -106,20 +67,10 @@
10667
<Name>System.Composition.TypedParts</Name>
10768
</ProjectReference>
10869
</ItemGroup>
109-
<ItemGroup>
110-
<None Include="packages.config" />
111-
</ItemGroup>
11270
<ItemGroup>
11371
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
11472
</ItemGroup>
11573
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
116-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
117-
<PropertyGroup>
118-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
119-
</PropertyGroup>
120-
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.0.0-beta5-build2785\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid\xunit.core.props'))" />
121-
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.0.99.9-build1021\build\net20\xunit.runner.visualstudio.props'))" />
122-
</Target>
12374
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12475
Other similar extension points exist, see Microsoft.Common.targets.
12576
<Target Name="BeforeBuild">

‎src/System.Composition.Convention/tests/packages.config‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/System.Composition.Convention/tests/project.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"dependencies": {
3+
"System.Linq.Expressions": "4.0.10-beta-*",
4+
"System.Reflection.Emit.Lightweight": "4.0.0-beta-*",
5+
"System.Runtime": "4.0.20-beta-*",
6+
"System.Runtime.Serialization.Primitives": "4.0.10-beta-*",
7+
"xunit": "2.0.0-beta5-build2785",
8+
"xunit.abstractions.netcore": "1.0.0-prerelease",
9+
"xunit.assert": "2.0.0-beta5-build2785",
10+
"xunit.core.netcore": "1.0.1-prerelease",
11+
"xunit.runner.visualstudio": "0.99.9-build1021",
12+
"xunit.netcore.extensions": "1.0.0-prerelease-*"
13+
},
14+
"frameworks": {
15+
"dnxcore50": { }
16+
}
17+
}

0 commit comments

Comments
 (0)