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

Commit 92e45ec

Browse files
twsouthwicktwsouthwick
authored
Merge pull request #662 from Microsoft/dev
Merge dev to master
2 parents 120f9d2 + 56d6578 commit 92e45ec

File tree

48 files changed

+815
-687
lines changed

Some content is hidden

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

48 files changed

+815
-687
lines changed

‎Directory.Build.targets‎

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

6060
<!-- GitVersionTask is not compiled against .NET Core, so importing the targets will
6161
result in a failure because it will try to resolve Microsoft.Build.Utilities v4.0 -->
62-
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
62+
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' AND Exists('$(MSBuildThisFileDirectory)\.git') ">
6363
<PrivateAssets>All</PrivateAssets>
6464
</PackageReference>
6565
</ItemGroup>

‎PortabilityTools.VisualStudio.Imports.targets‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
-->
1414
<Target Name="AddToVsixSources" AfterTargets="GetVsixSourceItems">
1515
<ItemGroup>
16-
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2015.dll" />
1716
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2017.dll" />
1817
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.Common.dll" />
1918
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.dll" />

‎PortabilityTools.sln‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cc
6666
EndProject
6767
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\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj", "{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}"
70-
EndProject
7169
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2017", "src\ApiPort\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj", "{C0629A8D-7107-46CF-83B8-408E1886AB36}"
7270
EndProject
7371
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.Common", "src\ApiPort\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj", "{60798B82-B273-4D39-AA52-021C7228A0AD}"
@@ -808,54 +806,6 @@ Global
808806
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
809807
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
810808
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
811-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
812-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
813-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.ActiveCfg = Debug|Any CPU
814-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.Build.0 = Debug|Any CPU
815-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.ActiveCfg = Debug|Any CPU
816-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.Build.0 = Debug|Any CPU
817-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.ActiveCfg = Debug|Any CPU
818-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.Build.0 = Debug|Any CPU
819-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
820-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
821-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
822-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
823-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
824-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.Build.0 = Debug|Any CPU
825-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
826-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.Build.0 = Debug|Any CPU
827-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
828-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
829-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
830-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.Build.0 = Release|Any CPU
831-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.ActiveCfg = Release|Any CPU
832-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.Build.0 = Release|Any CPU
833-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.ActiveCfg = Release|Any CPU
834-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.Build.0 = Release|Any CPU
835-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
836-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.Build.0 = Release|Any CPU
837-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.ActiveCfg = Release|Any CPU
838-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.Build.0 = Release|Any CPU
839-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.ActiveCfg = Release|Any CPU
840-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.Build.0 = Release|Any CPU
841-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.ActiveCfg = Release|Any CPU
842-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.Build.0 = Release|Any CPU
843-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
844-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
845-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
846-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
847-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
848-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
849-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
850-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
851-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
852-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
853-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
854-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
855-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
856-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
857-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
858-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
859809
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
860810
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.Build.0 = Debug|Any CPU
861811
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -1118,7 +1068,6 @@ Global
11181068
{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
11191069
{6917BF09-E416-43F9-B184-4691AF473271} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
11201070
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
1121-
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11221071
{C0629A8D-7107-46CF-83B8-408E1886AB36} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11231072
{60798B82-B273-4D39-AA52-021C7228A0AD} = {0D1724F6-078E-4576-9680-6B9334D562DC}
11241073
{EE708186-6345-486D-9810-17D98439DAAE} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For a quick introduction, check out [this video on Channel 9][Channel 9 Video]:
1515
## Using this Repository
1616

1717
### Windows
18-
There is a Visual Studio extension available for VS2017 and VS2015: [.NET Portability Analyzer](https://marketplace.visualstudio.com/items?itemName=ConnieYau.NETPortabilityAnalyzer)
18+
There is a Visual Studio extension available for VS2017: [.NET Portability Analyzer](https://marketplace.visualstudio.com/items?itemName=ConnieYau.NETPortabilityAnalyzer)
1919

2020
Download and build for yourself:
2121
1. Install [Visual Studio 2017 with .NET Core Workload][Visual Studio 2017]
@@ -27,11 +27,11 @@ Download and build for yourself:
2727

2828
1. Install [.NET Core SDK](https://www.microsoft.com/net/core)
2929
2. Execute: `build.sh`
30-
3. Go to: `bin/Debug/ApiPort/netcoreapp1.0`
30+
3. Go to: `bin/Debug/ApiPort/netcoreapp2.0`
3131
4. Run ApiPort by executing: `dotnet ApiPort.dll`
3232
* Example: `dotnet ApiPort.dll listTargets`
3333
* Example: `dotnet ApiPort.dll analyze -f Foo.dll -r HTML`
34-
5. For convenience, create an alias command adding the following to your ~/.bash_profile. Replace `{dotnet-apiport-folder}` with the path where you cloned the repo.
34+
5. For convenience, create an alias command adding the following to your `~/.bash_profile`. Replace `{dotnet-apiport-folder}` with the path where you cloned the repo.
3535
```
3636
alias apiport="dotnet {dotnet-apiport-folder}/bin/Debug/ApiPort/netcoreapp2.0/ApiPort.dll"
3737
```

‎build.ps1‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,20 @@ Set-DevEnvironment
113113
# Show the MSBuild version for failure investigations
114114
msbuild /version
115115

116+
$msbuild_version = (msbuild /version /nologo | Select-String -pattern '(?<major>[0-9]+)\.(?<minor>[0-9]+)')
117+
$binarylog_compat = $false
118+
119+
# check if msbuild_version is not null
120+
if ($msbuild_version){
121+
$msbuild_version = $msbuild_version.Matches[0].Groups
122+
123+
# check if msbuild_version is greater than or equal to 15.3
124+
# binary logging was added in 15.3
125+
if([int]$msbuild_version['major'].Value -ge 15 -and [int]$msbuild_version['minor'].Value -ge 3){
126+
$binarylog_compat = $true
127+
}
128+
}
129+
116130
$binFolder = [IO.Path]::Combine("bin", $Configuration)
117131

118132
New-Item $binFolder -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
@@ -125,10 +139,14 @@ $PlatformToUse = $Platform
125139
if ($Platform -eq "AnyCPU") {
126140
$PlatformToUse = "Any CPU"
127141
}
142+
$binarylog_switch = "/bl:$binFolder\msbuild.binlog"
143+
if (!$binarylog_compat) {
144+
$binarylog_switch = ""
145+
}
128146

129147
Push-Location $root
130148

131-
& msbuild PortabilityTools.sln "/t:restore;build;pack" /p:Configuration=$Configuration /p:Platform="$PlatformToUse" /nologo /m:1 /v:m /nr:false "/bl:$binFolder\msbuild.binlog"
149+
& msbuild PortabilityTools.sln "/t:restore;build;pack" /p:Configuration=$Configuration /p:Platform="$PlatformToUse" /nologo /m:1 /v:m /nr:false "$binarylog_switch"
132150

133151
Pop-Location
134152

‎docs/HowTo/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ for another. For details, see [Breaking Changes](BreakingChanges.md).
2828

2929
* [Console Application (.NET Framework)](../Console/README.md)
3030
* [.NET Core Application](../Console/README.md#using-net-core-application)
31-
* [Visual Studio 2015 Extension](../VSExtension/README.md)
31+
* [Visual Studio 2017 Extension](../VSExtension/README.md)

‎src/ApiPort/ApiPort.VisualStudio.2015/ApiPort.VisualStudio.2015.csproj‎

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

‎src/ApiPort/ApiPort.VisualStudio.2015/ProjectBuilder2015.cs‎

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

‎src/ApiPort/ApiPort.VisualStudio.2015/ServiceProvider.cs‎

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

‎src/ApiPort/ApiPort.VisualStudio.2015/VSThreadingService.cs‎

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

0 commit comments

Comments
 (0)