This repository has been archived by the owner on Jul 15, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 182
Migrate solution to VS2017 #411
Merged
Merged
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
a888104
Add .vscode to .gitignore
conniey 2069651
Update solution to VS2017
conniey 048d487
Fix duplicate import warnings because of dir.props and dir.targets
conniey 66a1006
Microsoft.Fx.Portability: Migrate to VS2017 project
conniey e76d128
Microsoft.Fx.Portability.MetadataReader: Migrate to VS2017 .NET Core …
conniey dcf596c
Microsoft.Fx.Portability.Reports.Json: Migrate to VS2017 .NET Core pr…
conniey 4ee4db3
Microsoft.Fx.Portability.Offline: Migrate to VS2017 .NET Core project
conniey 59cf7cc
ApiPort: Migrate to VS2017 and combine .NET Core
conniey 4d1b5a8
ApiPort: Remove manual app.config bindingRedirects and autogenerate them
conniey f156339
Remove ApiPort.Core from solution
conniey 8e545c1
ApiPort.Vsix: Update project to VS2017
conniey b89b50f
ApiPort.VisualStudio: Update to VS2017
conniey b6f59f7
Microsoft.Fx.Portability.CCI: Migrate to VS2017 .NET Standard project
conniey e48df2c
SearchFxApi: Migrate to VS2017
conniey 1eeaaf7
Microsoft.Fx.Portability.Reports.Html: Update to VS2017
conniey 04fb4f0
Microsoft.Fx.Portability.Cci.Tests: Upgrade to VS2017
conniey 4f5636a
Microsoft.Fx.Portability.CCI.Tests: Remove manual bindingRedirects in…
conniey 63a2c28
Add target that removes EmbeddedResources from being compiled
conniey ab45503
Microsoft.Fx.Portability.MetadataReader.Tests: Migrate to VS2017
conniey 9ced549
Microsoft.Fx.Portability.MetadataReader.Tests: Remove manual bindingR…
conniey 882ccf5
Microsoft.Fx.Portability.Offline.Tests: Migrate to VS2017
conniey 5eb4f98
Microsoft.Fx.Portability.Tests: Migrate to VS2017
conniey a9987e5
Initial migration of ApiPort.VisualStudio and ApiPort.Vsix
conniey 39d26ce
CCI.Tests and MetdataReader.Tests: Add autogeneration of
conniey 062f472
ApiPort: Update Microsoft package versions
conniey 11fd9f3
Microsoft.Fx.Portability.Reports.Html: Update NuGet packages
conniey 6d7bfff
Microsoft.Fx.Portability.MetadataReader.Tests: Update NuGet packages
conniey bc324a3
Microsoft.Fx.Portability: Update NuGet packages
conniey 6cec1c3
Microsoft.Fx.Portability.Cci.Tests: Update NuGet packages
conniey 1167327
ApiPortVS.Tests: Remove manual bindingRedirects
conniey bface83
Update System.Reflection.Metadata to 1.4.2
conniey 69f04ea
Fix tests for VS2017
conniey 99964b1
Microsoft.Fx.Portability.MetadataReader.Tests: Uncomment test after u…
conniey ea56751
ApiPort.VisualStudio: Fix build errors from upgrade
conniey 89b6adc
ApiPortVS.Tests: Update NuGet packages
conniey aae9835
ApiPort: Remove explicit inclusion of app.config
conniey 80614e2
ApiPort.Vsix: Revert project.json to packages.config due to NuGet/iss…
conniey e84edc2
ApiPort.VisualStudio: Revert project.json to packages.config due to N…
conniey 04a6294
ApiPort.Vsix: Add app.config
conniey 64ddeb8
ApiPortVS.Tests: Revert project.json to packages.config
conniey b396669
Disable <WarningsAsErrors> because of CS1701 runtime policy warnings.
conniey 70b0d56
ApiPort: Update Autofac.
conniey 79687d1
Microsoft.Fx.Portability.Cci: Add compiler directive for NETSTANDARD1_6
conniey 9d36f49
Update Get-BuildTools to NuGet v4.0.0
conniey 198d333
ApiPort: Fix System.Diagnostics.DiagnosticSource not found runtime er…
conniey 02f4477
Add Microsoft.TestHost to all projects so they run
conniey 035f084
Replace References with NuGet packages so people without VSIX Support…
conniey 08b1057
Adding Set-VsDevEnv.ps1 cmdlet
conniey 38a8d9d
Build Scripts: Update to find installed Visual studio 2017
conniey 37337de
ApiPort.VisualStudio: Fix Release build
conniey 5c76e2b
ApiPort.Vsix: Deploying extension during debug
conniey dc39eff
ApiPort.Vsix: Updated installation targets. Added import of VisualStu…
conniey ab9a15a
ApiPort.VisualStudio: Update project so it outputs a vsix that can be…
conniey 6d1595c
Microsoft.Fx.Portability.Offline: Consolidate Autofac versions
conniey 5c5a5c9
Update compiler directives to FEATURE_[NAME]
conniey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,4 +29,5 @@ src/Microsoft.Fx.Portability.Offline/data/ | |
| .tools/ | ||
| .data | ||
| *.nuget.props | ||
| *.nuget.targets | ||
| *.nuget.targets | ||
| .vscode | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| [CmdletBinding(DefaultParameterSetName = "Default")] # Needed to support -Verbose | ||
| param( | ||
| [Parameter(ParameterSetName=’Default’, Mandatory=$true, Position=0)] | ||
| [ValidateSet(2015,2017)] | ||
| [int]$VisualstudioVersion, | ||
|
|
||
| [Parameter(ParameterSetName=’PathGiven’, Mandatory=$true)] | ||
| [ValidateScript({Test-Path $_ })] | ||
| [string]$VsDevCmdPath | ||
| ) | ||
|
|
||
| $ErrorActionPreference = "Stop" | ||
|
|
||
| [bool]$findVsVersion = $true | ||
|
|
||
| if ($PSCmdlet.ParameterSetName -eq "PathGiven") { | ||
| $findVsVersion = $false | ||
| } | ||
|
|
||
| [string]$commonToolsPath = $null | ||
| [string]$VsDevCmdBat = "VsDevCmd.bat" | ||
|
|
||
| if ($findVsVersion) { | ||
| switch ($VisualstudioVersion) { | ||
| 2015 | ||
| { | ||
| $commonToolsPath = $env:VS140COMNTOOLS | ||
| } | ||
| 2017 | ||
| { | ||
| $microsoftVisualStudio = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017" | ||
|
|
||
| if (Test-Path $microsoftVisualStudio) { | ||
| $installations = Get-ChildItem $microsoftVisualStudio | ? { $_.PsIsContainer } | ||
|
|
||
| foreach ($installation in $installations) { | ||
| $path = Join-Path $installation.FullName "Common7\Tools\" | ||
|
|
||
| if (Test-Path $path) { | ||
| $commonToolsPath = $path | ||
| break | ||
| } | ||
| } | ||
| } else { | ||
| Write-Error "Could not locate: $microsoftVisualStudio. Pass path to $VsDevCmdBat using parameter -VsDevCmdPath." | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if ([string]::IsNullOrEmpty($commonToolsPath)) { | ||
| Write-Error "Could not find Common Tools for Visual Studio $VisualstudioVersion" | ||
| } | ||
|
|
||
| $devEnv = Join-Path $commonToolsPath $VsDevCmdBat | ||
|
|
||
| if (!(Test-Path $devEnv)) { | ||
| Write-Error "Could not find VsDevCmd.bat for Visual Studio $VisualstudioVersion. Path: $devEnv" | ||
| } | ||
|
|
||
| } else { | ||
| $file = Get-Item $VsDevCmdPath | ||
| $commonToolsPath = $file.DirectoryName | ||
| $VsDevCmdBat = $file.Name | ||
| } | ||
|
|
||
| pushd $commonToolsPath | ||
|
|
||
| $output = cmd /c "$VsDevCmdBat & set" | ||
|
|
||
| popd | ||
|
|
||
| foreach ($line in $output) | ||
| { | ||
| if ($line -match "(?<key>.*?)=(?<value>.*)") { | ||
| $key = $matches["key"] | ||
| $value = $matches["value"] | ||
|
|
||
| Write-Verbose("$key=$value") | ||
| Set-Item "ENV:\$key" -Value "$value" -Force | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why comment this out?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was commented out because of the CS1701 warnings due to the different assembly versions it is resolving.
When building our project, we are encountering ~900 warnings like this:
The reason for that is because Microsoft.Fx.Portability targets netstandard1.3 and ApiPort targets netcoreapp1.0. So at build time, Microsoft.Fx.Portability references System.Runtime 4.0.20.0... but ApiPort uses System.Runtime 4.1.0.0. This should not result in problems since we are only adding to the API surface area... but there is an issue about this aspnet/Mvc#5050 (comment). Should I make another in the right location?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Another option is to suppress the CS1701 warning.... but I am afraid that it will result in suppressing any binding redirect errors that may happen.