Skip to content

Commit 556b030

Browse files
TylerCarlson1TylerCarlson1
committed
Update to VS 2017
1 parent 4718a86 commit 556b030

23 files changed

+142
-506
lines changed

Diff for: ‎AutoMapper.Collection.sln

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26228.9
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{19AAEE83-5EEC-4EAA-9CF7-16F8ED58B50E}"
77
ProjectSection(SolutionItems) = preProject
@@ -14,20 +14,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1414
README.md = README.md
1515
EndProjectSection
1616
EndProject
17-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection", "src\AutoMapper.Collection\AutoMapper.Collection.xproj", "{37AD667A-8080-476C-88FD-20310AC7CAF3}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection", "src\AutoMapper.Collection\AutoMapper.Collection.csproj", "{37AD667A-8080-476C-88FD-20310AC7CAF3}"
1818
EndProject
19-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection.EntityFramework", "src\AutoMapper.Collection.EntityFramework\AutoMapper.Collection.EntityFramework.xproj", "{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}"
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.EntityFramework", "src\AutoMapper.Collection.EntityFramework\AutoMapper.Collection.EntityFramework.csproj", "{E0FD41FD-AF5B-4BEC-970F-8412E7B6C914}"
2020
EndProject
21-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection.LinqToSQL", "src\AutoMapper.Collection.LinqToSQL\AutoMapper.Collection.LinqToSQL.xproj", "{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}"
22-
EndProject
23-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutoMapper.Collection-Signed", "src\AutoMapper.Collection-Signed\AutoMapper.Collection-Signed.xproj", "{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMapper.Collection.LinqToSQL", "src\AutoMapper.Collection.LinqToSQL\AutoMapper.Collection.LinqToSQL.csproj", "{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}"
2422
EndProject
2523
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.Tests", "src\AutoMapper.Collection.Tests\AutoMapper.Collection.Tests.csproj", "{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}"
2624
EndProject
27-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.Net45", "src\AutoMapper.Collection.Net45\AutoMapper.Collection.Net45.csproj", "{19F40E9C-A4E2-4B89-A115-C6DC953E5BF5}"
28-
EndProject
29-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.EntityFramework.Net45", "src\AutoMapper.Collection.EntityFramework.Net45\AutoMapper.Collection.EntityFramework.Net45.csproj", "{D1CC7DD3-9E10-4FB3-8485-C1500E98DBB5}"
30-
EndProject
3125
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoMapper.Collection.EntityFramework.Tests", "src\AutoMapper.Collection.EntityFramework.Tests\AutoMapper.Collection.EntityFramework.Tests.csproj", "{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}"
3226
EndProject
3327
Global
@@ -48,22 +42,10 @@ Global
4842
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Debug|Any CPU.Build.0 = Debug|Any CPU
4943
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Release|Any CPU.ActiveCfg = Release|Any CPU
5044
{A0A023B6-D02A-4CD3-9B3D-3B3022DB001A}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{17CBAFE0-F758-47FB-86A1-F3AFEB0389B0}.Release|Any CPU.Build.0 = Release|Any CPU
5545
{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5646
{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
5747
{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
5848
{2D3D34AD-6A0A-4382-9A2F-894F52D184A7}.Release|Any CPU.Build.0 = Release|Any CPU
59-
{19F40E9C-A4E2-4B89-A115-C6DC953E5BF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60-
{19F40E9C-A4E2-4B89-A115-C6DC953E5BF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
61-
{19F40E9C-A4E2-4B89-A115-C6DC953E5BF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{19F40E9C-A4E2-4B89-A115-C6DC953E5BF5}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{D1CC7DD3-9E10-4FB3-8485-C1500E98DBB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
64-
{D1CC7DD3-9E10-4FB3-8485-C1500E98DBB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
65-
{D1CC7DD3-9E10-4FB3-8485-C1500E98DBB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
66-
{D1CC7DD3-9E10-4FB3-8485-C1500E98DBB5}.Release|Any CPU.Build.0 = Release|Any CPU
6749
{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6850
{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}.Debug|Any CPU.Build.0 = Debug|Any CPU
6951
{BDE127AB-AC3F-44DF-BC33-210DAFD12E15}.Release|Any CPU.ActiveCfg = Release|Any CPU

Diff for: ‎global.json

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
1-
{
2-
"sdk": {
3-
"version": "1.0.0-preview2-003121"
4-
},
5-
"projects": []
6-
}
1+
{"projects":[]}

Diff for: ‎src/AutoMapper.Collection-Signed/AutoMapper.Collection-Signed.csproj

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Collection Add/Remove/Update support for AutoMapper. AutoMapper.Collection adds EqualityComparison Expressions for TypeMaps to determine if Source and Destination type are equivalent to each other when mapping collections.</Description>
5+
<VersionPrefix>3.0.0</VersionPrefix>
6+
<Authors>Tyler Carlson</Authors>
7+
<TargetFrameworks>net45;netstandard1.1;netstandard1.3</TargetFrameworks>
8+
<AssemblyName>AutoMapper.Collection-Signed</AssemblyName>
9+
<AssemblyOriginatorKeyFile>../Key.snk</AssemblyOriginatorKeyFile>
10+
<SignAssembly>true</SignAssembly>
11+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
12+
<PackageId>AutoMapper.Collection-Signed</PackageId>
13+
<PackageIconUrl>https://s3.amazonaws.com/automapper/icon.png</PackageIconUrl>
14+
<PackageProjectUrl>https://github.com/AutoMapper/Automapper.Collection</PackageProjectUrl>
15+
<PackageLicenseUrl>https://github.com/AutoMapper/AutoMapper.Collection/blob/master/LICENSE.txt</PackageLicenseUrl>
16+
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);portable-net45+win8+dnxcore50;portable-net45+win8</PackageTargetFallback>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<Compile Remove="..\AutoMapper.Collection\**\obj\*;..\AutoMapper.Collection\**\bin\*" />
21+
<Compile Include="..\AutoMapper.Collection\**\*.cs" Exclude="..\AutoMapper.Collection\**\obj\*;..\AutoMapper.Collection\**\bin\*;bin\**;obj\**;**\*.xproj;packages\**" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="AutoMapper" Version="6.0.0" />
26+
</ItemGroup>
27+
28+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
29+
<Reference Include="System" />
30+
<Reference Include="Microsoft.CSharp" />
31+
</ItemGroup>
32+
33+
</Project>

Diff for: ‎src/AutoMapper.Collection-Signed/AutoMapper.Collection-Signed.xproj

-25
This file was deleted.

Diff for: ‎src/AutoMapper.Collection-Signed/project.json

-45
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Net45/App.config

-17
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Net45/AutoMapper.Collection.EntityFramework.Net45.csproj

-87
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Net45/Class1.cs

-12
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Net45/Properties/AssemblyInfo.cs

-36
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Net45/packages.config

-6
This file was deleted.

Diff for: ‎src/AutoMapper.Collection.EntityFramework.Tests/AutoMapper.Collection.EntityFramework.Tests.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@
7272
<Compile Include="MapCollectionWithEqualityTests.cs" />
7373
<Compile Include="Properties\AssemblyInfo.cs" />
7474
</ItemGroup>
75-
<ItemGroup>
76-
<ProjectReference Include="..\AutoMapper.Collection.EntityFramework.Net45\AutoMapper.Collection.EntityFramework.Net45.csproj">
77-
<Project>{d1cc7dd3-9e10-4fb3-8485-c1500e98dbb5}</Project>
78-
<Name>AutoMapper.Collection.EntityFramework.Net45</Name>
79-
</ProjectReference>
80-
<ProjectReference Include="..\AutoMapper.Collection.Net45\AutoMapper.Collection.Net45.csproj">
81-
<Project>{19f40e9c-a4e2-4b89-a115-c6dc953e5bf5}</Project>
82-
<Name>AutoMapper.Collection.Net45</Name>
83-
</ProjectReference>
84-
</ItemGroup>
8575
<ItemGroup>
8676
<None Include="App.config" />
8777
<None Include="packages.config" />
8878
</ItemGroup>
8979
<ItemGroup>
9080
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
9181
</ItemGroup>
82+
<ItemGroup>
83+
<ProjectReference Include="..\AutoMapper.Collection.EntityFramework\AutoMapper.Collection.EntityFramework.csproj">
84+
<Project>{e0fd41fd-af5b-4bec-970f-8412e7b6c914}</Project>
85+
<Name>AutoMapper.Collection.EntityFramework</Name>
86+
</ProjectReference>
87+
<ProjectReference Include="..\AutoMapper.Collection\AutoMapper.Collection.csproj">
88+
<Project>{37ad667a-8080-476c-88fd-20310ac7caf3}</Project>
89+
<Name>AutoMapper.Collection</Name>
90+
</ProjectReference>
91+
</ItemGroup>
9292
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9393
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9494
Other similar extension points exist, see Microsoft.Common.targets.

0 commit comments

Comments
 (0)