-
Notifications
You must be signed in to change notification settings - Fork 59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
upgrade for VS2017. Supporting OData v1 until v4. #53
Conversation
@robsiera, It will cover your contributions to all Microsoft-managed open source projects. |
@robsiera, thanks for signing the contribution license agreement. We will now validate the agreement and then the pull request. |
@@ -34,13 +39,13 @@ | |||
<AppDesignerFolder>Properties</AppDesignerFolder> | |||
<RootNamespace>Microsoft.OData.ConnectedService</RootNamespace> | |||
<AssemblyName>Microsoft.OData.ConnectedService</AssemblyName> | |||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> | |||
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion> |
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.
Was there a reason to move to NET Framework 4.6? Are we able to stick with 4.5 to minimize changes?
<FileAlignment>512</FileAlignment> | ||
<GeneratePkgDefFile>false</GeneratePkgDefFile> | ||
<StartAction>Program</StartAction> | ||
<StartProgram>C:\Program Files (x86)\Microsoft Visual Studio $(VisualStudioVersion)\Common7\IDE\devenv.exe</StartProgram> | ||
<StartArguments>/rootSuffix exp</StartArguments> | ||
<SignAssembly>true</SignAssembly> | ||
<SignAssembly>false</SignAssembly> |
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.
Let's leave this set to "true".
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration> |
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 may have been modified by Visual Studio in conjunction with the NET Framework version update. If we decide v4.6 is the way to go, feel free to ignore this comment. Otherwise, if we revert to v4.5, we'll have to change this too.
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.
Thanks for the PR @robsiera! I've verified that this commit does install on VS2017. However, I'd like to keep changes to a minimal so I've included comments regarding some of them here, mainly regarding the .NET Framework version change. Once we resolve those, I'll help merge.
@@ -82,17 +87,26 @@ | |||
<SpecificVersion>False</SpecificVersion> | |||
<HintPath>..\external\Binaries\V3\Microsoft.Data.Services.Design.dll</HintPath> | |||
</Reference> | |||
<Reference Include="Microsoft.OData.Edm"> | |||
<HintPath>..\external\Binaries\V4\Microsoft.OData.Edm.dll</HintPath> | |||
<Reference Include="Microsoft.OData.Client, Version=6.16.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> |
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.
Microsoft.OData.Client 6.17.0.0 has been released since this PR. Let's use the latest version. I attempted to use a wild card (e.g. 6.*) in the csproj to reference the latest 6.x version without having to hardcode, but unfortunately Visual Studio didn't like that syntax.
No description provided.