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

Commit 6218174

Browse files
authored
Merge pull request #591 from Microsoft/dev
2 parents 3995a05 + 8759eb4 commit 6218174

File tree

400 files changed

+441
-517
lines changed

Some content is hidden

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

400 files changed

+441
-517
lines changed

PortabilityTools.sln

Lines changed: 45 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27004.2009
4+
VisualStudioVersion = 15.0.27130.2036
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C991F5FC-04B5-420C-98A0-80974AA946F7}"
77
ProjectSection(SolutionItems) = preProject
@@ -34,49 +34,55 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F829
3434
EndProject
3535
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiPort", "ApiPort", "{0D1724F6-078E-4576-9680-6B9334D562DC}"
3636
EndProject
37-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort", "src\ApiPort\ApiPort.csproj", "{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort", "src\ApiPort\ApiPort\ApiPort.csproj", "{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72}"
3838
EndProject
39-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.MetadataReader.Tests", "tests\Microsoft.Fx.Portability.MetadataReader.Tests\Microsoft.Fx.Portability.MetadataReader.Tests.csproj", "{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}"
39+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.MetadataReader.Tests", "tests\lib\Microsoft.Fx.Portability.MetadataReader.Tests\Microsoft.Fx.Portability.MetadataReader.Tests.csproj", "{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC}"
4040
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Html", "src\Microsoft.Fx.Portability.Reports.Html\Microsoft.Fx.Portability.Reports.Html.csproj", "{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}"
41+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Html", "src\lib\Microsoft.Fx.Portability.Reports.Html\Microsoft.Fx.Portability.Reports.Html.csproj", "{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60}"
4242
EndProject
43-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Offline", "src\Microsoft.Fx.Portability.Offline\Microsoft.Fx.Portability.Offline.csproj", "{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}"
43+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Offline", "src\lib\Microsoft.Fx.Portability.Offline\Microsoft.Fx.Portability.Offline.csproj", "{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549}"
4444
EndProject
45-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability", "src\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj", "{8D84EC23-9977-4CC8-B649-035FFAE9664C}"
45+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability", "src\lib\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj", "{8D84EC23-9977-4CC8-B649-035FFAE9664C}"
4646
EndProject
47-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.MetadataReader", "src\Microsoft.Fx.Portability.MetadataReader\Microsoft.Fx.Portability.MetadataReader.csproj", "{68C6476E-1F80-412A-A8A7-480F832922D8}"
47+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.MetadataReader", "src\lib\Microsoft.Fx.Portability.MetadataReader\Microsoft.Fx.Portability.MetadataReader.csproj", "{68C6476E-1F80-412A-A8A7-480F832922D8}"
4848
EndProject
49-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Tests", "tests\Microsoft.Fx.Portability.Tests\Microsoft.Fx.Portability.Tests.csproj", "{36E8F09A-D3CA-405B-B515-9206F85B432C}"
49+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Tests", "tests\lib\Microsoft.Fx.Portability.Tests\Microsoft.Fx.Portability.Tests.csproj", "{36E8F09A-D3CA-405B-B515-9206F85B432C}"
5050
EndProject
5151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SearchFxApi", "samples\SearchFxApi\SearchFxApi.csproj", "{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC}"
5252
EndProject
53-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Json", "src\Microsoft.Fx.Portability.Reports.Json\Microsoft.Fx.Portability.Reports.Json.csproj", "{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}"
53+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Json", "src\lib\Microsoft.Fx.Portability.Reports.Json\Microsoft.Fx.Portability.Reports.Json.csproj", "{28D8D77D-E68D-4EBC-9150-F7C433D63BFA}"
5454
EndProject
55-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Offline.Tests", "tests\Microsoft.Fx.Portability.Offline.Tests\Microsoft.Fx.Portability.Offline.Tests.csproj", "{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}"
55+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Offline.Tests", "tests\lib\Microsoft.Fx.Portability.Offline.Tests\Microsoft.Fx.Portability.Offline.Tests.csproj", "{FD6B4124-975B-454E-ACC8-424CC9A8BB8B}"
5656
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiPort.Vsix", "src\ApiPort.Vsix\ApiPort.Vsix.csproj", "{C4301817-D6F9-43A4-9E24-5446C0A2C15C}"
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiPort.Vsix", "src\ApiPort\ApiPort.Vsix\ApiPort.Vsix.csproj", "{C4301817-D6F9-43A4-9E24-5446C0A2C15C}"
5858
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiPort.VisualStudio", "src\ApiPort.VisualStudio\ApiPort.VisualStudio.csproj", "{D15030D8-CFC5-4F05-8987-784326856E90}"
59+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiPort.VisualStudio", "src\ApiPort\ApiPort.VisualStudio\ApiPort.VisualStudio.csproj", "{D15030D8-CFC5-4F05-8987-784326856E90}"
6060
EndProject
61-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cci", "src\Microsoft.Fx.Portability.Cci\Microsoft.Fx.Portability.Cci.csproj", "{B0468D19-0F98-49A8-BA28-926331C72E26}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cci", "src\lib\Microsoft.Fx.Portability.Cci\Microsoft.Fx.Portability.Cci.csproj", "{B0468D19-0F98-49A8-BA28-926331C72E26}"
6262
EndProject
63-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPortVS.Tests", "tests\ApiPortVS.Tests\ApiPortVS.Tests.csproj", "{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}"
63+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPortVS.Tests", "tests\ApiPort\ApiPortVS.Tests\ApiPortVS.Tests.csproj", "{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E}"
6464
EndProject
65-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cci.Tests", "tests\Microsoft.Fx.Portability.Cci.Tests\Microsoft.Fx.Portability.Cci.Tests.csproj", "{6917BF09-E416-43F9-B184-4691AF473271}"
65+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cci.Tests", "tests\lib\Microsoft.Fx.Portability.Cci.Tests\Microsoft.Fx.Portability.Cci.Tests.csproj", "{6917BF09-E416-43F9-B184-4691AF473271}"
6666
EndProject
67-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Html.Tests", "tests\Microsoft.Fx.Portability.Reports.Html.Tests\Microsoft.Fx.Portability.Reports.Html.Tests.csproj", "{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}"
67+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Html.Tests", "tests\lib\Microsoft.Fx.Portability.Reports.Html.Tests\Microsoft.Fx.Portability.Reports.Html.Tests.csproj", "{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}"
6868
EndProject
69-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2015", "src\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj", "{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}"
69+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2015", "src\ApiPort\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj", "{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}"
7070
EndProject
71-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2017", "src\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj", "{C0629A8D-7107-46CF-83B8-408E1886AB36}"
71+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2017", "src\ApiPort\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj", "{C0629A8D-7107-46CF-83B8-408E1886AB36}"
7272
EndProject
73-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.Common", "src\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj", "{60798B82-B273-4D39-AA52-021C7228A0AD}"
73+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.Common", "src\ApiPort\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj", "{60798B82-B273-4D39-AA52-021C7228A0AD}"
7474
EndProject
75-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.Tests", "tests\ApiPort.Tests\ApiPort.Tests.csproj", "{EE708186-6345-486D-9810-17D98439DAAE}"
75+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.Tests", "tests\ApiPort\ApiPort.Tests\ApiPort.Tests.csproj", "{EE708186-6345-486D-9810-17D98439DAAE}"
7676
EndProject
77-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Excel", "src\Microsoft.Fx.Portability.Reports.Excel\Microsoft.Fx.Portability.Reports.Excel.csproj", "{47008779-1D31-4E0C-B21A-5F4FB84470A0}"
77+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Reports.Excel", "src\lib\Microsoft.Fx.Portability.Reports.Excel\Microsoft.Fx.Portability.Reports.Excel.csproj", "{47008779-1D31-4E0C-B21A-5F4FB84470A0}"
7878
EndProject
79-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.Offline", "src\ApiPort\ApiPort.Offline.csproj", "{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}"
79+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.Offline", "src\ApiPort\ApiPort\ApiPort.Offline.csproj", "{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE}"
80+
EndProject
81+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{D66AC566-3B80-46F0-8687-3C5F4D203F1A}"
82+
EndProject
83+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiPort", "ApiPort", "{C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}"
84+
EndProject
85+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lib", "lib", "{CB5759DE-9D7B-4B21-89BC-E81920D611BB}"
8086
EndProject
8187
Global
8288
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -1097,27 +1103,30 @@ Global
10971103
GlobalSection(NestedProjects) = preSolution
10981104
{0D1724F6-078E-4576-9680-6B9334D562DC} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
10991105
{5A2EAD0F-FF3E-4968-A865-7B29C4B10A72} = {0D1724F6-078E-4576-9680-6B9334D562DC}
1100-
{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1101-
{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1102-
{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1103-
{8D84EC23-9977-4CC8-B649-035FFAE9664C} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1104-
{68C6476E-1F80-412A-A8A7-480F832922D8} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1105-
{36E8F09A-D3CA-405B-B515-9206F85B432C} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1106+
{B44085A7-0DCD-4CE2-BDD9-B2E5268DCCCC} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
1107+
{83F4A5FE-FAF8-4952-899E-EA0BB08F8E60} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1108+
{F3D148CA-D49D-4315-9CD6-AE7B0EEA9549} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1109+
{8D84EC23-9977-4CC8-B649-035FFAE9664C} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1110+
{68C6476E-1F80-412A-A8A7-480F832922D8} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1111+
{36E8F09A-D3CA-405B-B515-9206F85B432C} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
11061112
{16815A46-F1CA-4D56-80C8-54C4DFB8C1BC} = {F8292A68-AF7C-4B26-B1B8-B232548EF118}
1107-
{28D8D77D-E68D-4EBC-9150-F7C433D63BFA} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1108-
{FD6B4124-975B-454E-ACC8-424CC9A8BB8B} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1113+
{28D8D77D-E68D-4EBC-9150-F7C433D63BFA} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1114+
{FD6B4124-975B-454E-ACC8-424CC9A8BB8B} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
11091115
{C4301817-D6F9-43A4-9E24-5446C0A2C15C} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11101116
{D15030D8-CFC5-4F05-8987-784326856E90} = {0D1724F6-078E-4576-9680-6B9334D562DC}
1111-
{B0468D19-0F98-49A8-BA28-926331C72E26} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1112-
{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1113-
{6917BF09-E416-43F9-B184-4691AF473271} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1114-
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1117+
{B0468D19-0F98-49A8-BA28-926331C72E26} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
1118+
{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
1119+
{6917BF09-E416-43F9-B184-4691AF473271} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
1120+
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
11151121
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11161122
{C0629A8D-7107-46CF-83B8-408E1886AB36} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11171123
{60798B82-B273-4D39-AA52-021C7228A0AD} = {0D1724F6-078E-4576-9680-6B9334D562DC}
1118-
{EE708186-6345-486D-9810-17D98439DAAE} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1119-
{47008779-1D31-4E0C-B21A-5F4FB84470A0} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1124+
{EE708186-6345-486D-9810-17D98439DAAE} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
1125+
{47008779-1D31-4E0C-B21A-5F4FB84470A0} = {D66AC566-3B80-46F0-8687-3C5F4D203F1A}
11201126
{2DFBC0D7-E65F-4F85-9E60-5F6C4BA8F4FE} = {0D1724F6-078E-4576-9680-6B9334D562DC}
1127+
{D66AC566-3B80-46F0-8687-3C5F4D203F1A} = {6234AABE-C4F3-4094-9C0D-FFD589235DBE}
1128+
{C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
1129+
{CB5759DE-9D7B-4B21-89BC-E81920D611BB} = {7DC7AA2C-0401-495B-B42C-32F44085EBE6}
11211130
EndGlobalSection
11221131
GlobalSection(ExtensibilityGlobals) = postSolution
11231132
SolutionGuid = {8E8B2DB2-4847-4909-8631-A995D50F10EF}

README.md

Lines changed: 5 additions & 0 deletions

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ installSDK() {
5050
build() {
5151
echo "Building ApiPort... Configuration: ["$Configuration"]"
5252

53-
pushd src/ApiPort > /dev/null
53+
pushd src/ApiPort/ApiPort > /dev/null
5454
$DotNetExe build ApiPort.csproj -f netcoreapp2.0 -c $Configuration
5555
$DotNetExe build ApiPort.Offline.csproj -f netcoreapp2.0 -c $Configuration
5656
popd > /dev/null

samples/SearchFxApi/SearchFxApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<ProjectReference Include="..\..\src\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj" />
8+
<ProjectReference Include="..\..\src\lib\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj" />
99
</ItemGroup>
1010

1111
</Project>

src/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj renamed to src/ApiPort/ApiPort.VisualStudio.2017/ApiPort.VisualStudio.2017.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
<ItemGroup>
1919
<ProjectReference Include="..\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj" />
20-
<ProjectReference Include="..\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj" />
20+
<ProjectReference Include="..\..\lib\Microsoft.Fx.Portability\Microsoft.Fx.Portability.csproj" />
2121
</ItemGroup>
2222

2323
</Project>

0 commit comments

Comments
 (0)