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

Merge dev to master #662

Merged
twsouthwick merged 13 commits into from
May 22, 2018
Merged

Merge dev to master #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
09089d4
Added ability to detect msbuild version - and set binarylogging if (#…
nmbro Mar 29, 2018
d7e2bd5
Assembly and API Filter Improvements (#599)
conniey Apr 6, 2018
1300def
Improve HTML report accessibility (#607)
chlowell Apr 13, 2018
84e4763
Minor fix on string #34 (#606)
kant Apr 13, 2018
7a62d9e
Accessibility fixes for VSIX (#593)
conniey Apr 25, 2018
a2cfdca
Fix instructions to netcoreapp2.0 (#626)
drnic Apr 30, 2018
9aed82f
Remove ApiPort.VisualStudio.2015 (#624)
chlowell May 2, 2018
fd081ba
update VS shell assembly version (#634)
chlowell May 9, 2018
aa5dbc5
NoFilesAvailableToUpload -> NoFilesToAnalyze (#637)
chlowell May 9, 2018
b78b451
Exclude GitVersion if no .git folder is available (#645)
twsouthwick May 14, 2018
9242ecc
Merge branch 'master' into dev
twsouthwick May 17, 2018
120f9f3
Merge pull request #651 from master
twsouthwick May 17, 2018
56d6578
VS extension accessibility improvements (#658)
chlowell May 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@

<!-- GitVersionTask is not compiled against .NET Core, so importing the targets will
result in a failure because it will try to resolve Microsoft.Build.Utilities v4.0 -->
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' AND Exists('$(MSBuildThisFileDirectory)\.git') ">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion PortabilityTools.VisualStudio.Imports.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
-->
<Target Name="AddToVsixSources" AfterTargets="GetVsixSourceItems">
<ItemGroup>
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2015.dll" />
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.2017.dll" />
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.Common.dll" />
<VSIXSourceItem Include="$(OutputPath)\ApiPort.VisualStudio.dll" />
Expand Down
51 changes: 0 additions & 51 deletions PortabilityTools.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Fx.Portability.Cc
EndProject
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}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2015", "src\ApiPort\ApiPort.VisualStudio.2015\ApiPort.VisualStudio.2015.csproj", "{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.2017", "src\ApiPort\ApiPort.VisualStudio.2017\ApiPort.VisualStudio.2017.csproj", "{C0629A8D-7107-46CF-83B8-408E1886AB36}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiPort.VisualStudio.Common", "src\ApiPort\ApiPort.VisualStudio.Common\ApiPort.VisualStudio.Common.csproj", "{60798B82-B273-4D39-AA52-021C7228A0AD}"
Expand Down Expand Up @@ -808,54 +806,6 @@ Global
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|ARM.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x64.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Debug|x86.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|Any CPU.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|ARM.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x64.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Debug|x86.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|Any CPU.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|ARM.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x64.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Osx_Release|x86.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|Any CPU.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|ARM.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x64.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Release|x86.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|ARM.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.ActiveCfg = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Debug|x86.Build.0 = Debug|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|ARM.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.ActiveCfg = Release|Any CPU
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F}.Ubuntu_Release|x86.Build.0 = Release|Any CPU
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C0629A8D-7107-46CF-83B8-408E1886AB36}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -1118,7 +1068,6 @@ Global
{2D8DA586-E0EA-4AD1-BA3C-E4AC0310A45E} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
{6917BF09-E416-43F9-B184-4691AF473271} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
{4EDE5B41-A4AD-4BFB-9986-F566FB887A34} = {CB5759DE-9D7B-4B21-89BC-E81920D611BB}
{9DEF460B-6383-4665-839B-C0B5E6BB6A5F} = {0D1724F6-078E-4576-9680-6B9334D562DC}
{C0629A8D-7107-46CF-83B8-408E1886AB36} = {0D1724F6-078E-4576-9680-6B9334D562DC}
{60798B82-B273-4D39-AA52-021C7228A0AD} = {0D1724F6-078E-4576-9680-6B9334D562DC}
{EE708186-6345-486D-9810-17D98439DAAE} = {C2CF3FE7-5A24-4FEF-B833-86FBAC5D5731}
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ For a quick introduction, check out [this video on Channel 9][Channel 9 Video]:
## Using this Repository

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

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

1. Install [.NET Core SDK](https://www.microsoft.com/net/core)
2. Execute: `build.sh`
3. Go to: `bin/Debug/ApiPort/netcoreapp1.0`
3. Go to: `bin/Debug/ApiPort/netcoreapp2.0`
4. Run ApiPort by executing: `dotnet ApiPort.dll`
* Example: `dotnet ApiPort.dll listTargets`
* Example: `dotnet ApiPort.dll analyze -f Foo.dll -r HTML`
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.
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.
```
alias apiport="dotnet {dotnet-apiport-folder}/bin/Debug/ApiPort/netcoreapp2.0/ApiPort.dll"
```
Expand Down
20 changes: 19 additions & 1 deletion build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,20 @@ Set-DevEnvironment
# Show the MSBuild version for failure investigations
msbuild /version

$msbuild_version = (msbuild /version /nologo | Select-String -pattern '(?<major>[0-9]+)\.(?<minor>[0-9]+)')
$binarylog_compat = $false

# check if msbuild_version is not null
if ($msbuild_version){
$msbuild_version = $msbuild_version.Matches[0].Groups

# check if msbuild_version is greater than or equal to 15.3
# binary logging was added in 15.3
if([int]$msbuild_version['major'].Value -ge 15 -and [int]$msbuild_version['minor'].Value -ge 3){
$binarylog_compat = $true
}
}

$binFolder = [IO.Path]::Combine("bin", $Configuration)

New-Item $binFolder -ItemType Directory -ErrorAction SilentlyContinue | Out-Null
Expand All @@ -125,10 +139,14 @@ $PlatformToUse = $Platform
if ($Platform -eq "AnyCPU") {
$PlatformToUse = "Any CPU"
}
$binarylog_switch = "/bl:$binFolder\msbuild.binlog"
if (!$binarylog_compat) {
$binarylog_switch = ""
}

Push-Location $root

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

Pop-Location

Expand Down
2 changes: 1 addition & 1 deletion docs/HowTo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ for another. For details, see [Breaking Changes](BreakingChanges.md).

* [Console Application (.NET Framework)](../Console/README.md)
* [.NET Core Application](../Console/README.md#using-net-core-application)
* [Visual Studio 2015 Extension](../VSExtension/README.md)
* [Visual Studio 2017 Extension](../VSExtension/README.md)
22 changes: 0 additions & 22 deletions src/ApiPort/ApiPort.VisualStudio.2015/ApiPort.VisualStudio.2015.csproj
View file
Open in desktop

This file was deleted.

120 changes: 0 additions & 120 deletions src/ApiPort/ApiPort.VisualStudio.2015/ProjectBuilder2015.cs
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/ApiPort/ApiPort.VisualStudio.2015/ServiceProvider.cs
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions src/ApiPort/ApiPort.VisualStudio.2015/VSThreadingService.cs
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions src/ApiPort/ApiPort.VisualStudio.Common/ApiPort.VisualStudio.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@

<ItemGroup>
<PackageReference Include="EnvDTE100" Version="10.0.1" />
<PackageReference Include="Microsoft.Build" Version="14.3.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
<PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
<PackageReference Include="Microsoft.Build" Version="15.6.85" />
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="15.4.27004" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="15.4.4" />
<PackageReference Include="NuGet.VisualStudio" Version="4.4.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
Expand Down
Loading