Move to MSBuild tooling #144

galvesribeiro · 2017-01-09T00:54:59Z

As mentioned in #143, starting by migrating projects.

msftclas · 2017-01-09T00:55:05Z

Hi @galvesribeiro, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution!
You've already signed the contribution license agreement. Thanks!

The agreement was validated by Microsoft and real humans are currently evaluating your PR.

TTYL, MSBOT;

galvesribeiro · 2017-01-09T01:29:47Z

For whatever reason on appveyor we are getting that error:

C:\Program Files\dotnet\sdk\1.0.0-preview5-004460\Roslyn\Microsoft.CSharp.Core.targets(71,5): error MSB3105: The item "AnonymousCredentials.cs" was specified more than once in the "Sources" parameter.  Duplicate items are not supported by the "Sources" parameter. [C:\projects\docker-dotnet\Docker.DotNet\Docker.DotNet.csproj]

It build just fine here... Trying to find someone from .Net SDK Team to check this out...

galvesribeiro · 2017-01-09T02:14:45Z

Changed the build script to install .NET Core SDK 1.0 Preview 4 build 004233 instead of latest 1.0.0-preview5-004232 and build work.
Someone from SDK team is tracking it here dotnet/sdk#604.

jterry75 · 2017-01-09T19:57:54Z

@galvesribeiro - Thanks for the contribution. Before I do a full CR I noticed that you are removing support for .NET 45. Can I ask why? Some of our users want that to our knowledge and the package should continue to be supported.

galvesribeiro · 2017-01-09T20:52:13Z

@jterry75 Hey, I tried to get on netstandard1.1 first, which covers 4.5 and would avoid the multitargeting. however, some of the dependencies (IIRC the named-pipes one or one of its dependencies) does not support it and since 4.5.x is out of MS support cycle I was wondering if we could move to the minimal supported version (4.6) which is covered by netstandard1.3.

If this is a requirement, no problem, I'll change it to multitarget just as before.

In all cases, you can review the code changes since they are minimal. All I did was remove the #if statements since I moved all to netstandard1.3 and they weren't required.

I'll add them back and update the PR but feel free to start reviewing.

Thanks

jterry75 · 2017-01-09T22:47:49Z

@jstarks - Do we know if we can update to net 4.6 or not?

jterry75

Good start! I didnt review the code to remove the net45 or 46 pending what @jstarks says on the main thread.

jterry75 · 2017-01-09T22:50:23Z

Docker.DotNet.BasicAuth/Docker.DotNet.BasicAuth.csproj

+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" />


This can be removed right? It will pickup all *.cs in the project folders.

If we use the latest bits from the SDK, we can remove it however, it is broken. Visual Studio don't work with it, just the CLI. I'm looking at it with the proper team here dotnet/sdk#604

The version I added on AppVeyor scripts is the preview4 which is the stable version of the MSBuild sdk for .net core. And that require this globbing.

When they fix that issue (scheduled for the next release of the SDK probably) I can remove it and update the build script.

Ok no worries we can update it later.

jterry75 · 2017-01-09T22:52:02Z

Docker.DotNet.Tests/Docker.DotNet.Tests.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">


Want to put this under tests/Docker.DotNet.Tests instead? Really the proper folder layout would be to move the project under src/ and then test/ as a peer.

But great to add the test project now!

I was about to do that, but I first wanted you guys to easily review it so the diff here is easier without a bunch of delete/move that GH will do.

Once you give the OK on this PR, I'll reset and push again with the src/ and test/ folders in place.

jterry75 · 2017-01-09T22:53:20Z

Docker.DotNet.BasicAuth.nuspec

+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>Docker.DotNet.BasicAuth</id>
+    <version>2.124.3</version>


We probably should update the AppVeyor to change this at build to maintain the dev build numbers.

I was trying to just get the nuget metadata from the project.json to a .nuspec the way it was in the repo. But yes, will look on how to do that with appVeyor once I have everything else approved.

Im actually confused here. What I was remembering was our other project AppVeyor.yaml where you see we crack the .json in order to maintain a dev build. The one in the .nuspec is for the released version.

@swernli - Are we not doing dev builds for this AppVeyor here too?

We can, like I said, that will be updated to accept the build number as a parameter from the one calling the build (i.e. AppVeyor)

jterry75 · 2017-01-09T22:55:18Z

Docker.DotNet.X509/RSAUtil.cs

@@ -19,20 +15,6 @@ public static X509Certificate2 GetCertFromPFX(string pfxFilePath, string passwor
            return new X509Certificate2(pfxFilePath, password);
        }

-#if (NET45 || NET46)
-        public static X509Certificate2 GetCertFromPFXSecure(string pfxFilePath, SecureString password)


Can you leave these functions. It is additional support we want to add when netstandard supports it.

Ok, will get all the #if back.

Btw, X509Certificate2 is supported on netstandard1.1+ (which has net45in it). However, SecureString is netstandard1.3(which includes net46) so if staying with netstandard1.3 we keep this just fine.

Yea its not X509Certificate2 its actually the .PrivateKey that I remember not being there. We need to support reading keys from .PEM files so we cant remove this

jterry75 · 2017-01-09T23:12:49Z

Docker.DotNet.sln

@@ -1,39 +1,93 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+# Visual Studio 15


I don't love requiring VS 15 but oh well. We can still use the command line I guess

Yeah, unfortunately the MSBuild tooling require VS15 :( And yes, if you don't want VS to build, you can use command line.

jterry75 · 2017-01-09T23:13:31Z

Docker.DotNet.sln

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9ADC524F-FC79-4D05-9536-37BB4D426C0F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docker.DotNet.Tests", "Docker.DotNet.Tests\Docker.DotNet.Tests.csproj", "{3225A078-3F6C-4293-B580-1EA3203EA3E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{5B3E2DDE-7EF4-4E55-A0BF-05EF43048336}"


This is new to me. Why add the nuspec's to the solution? Is that a new csproj requirement?

I was just used to do it so it is handy to edit. But I'll remove.

jterry75 · 2017-01-09T23:16:22Z

Docker.DotNet/Microsoft.Net.Http.Client/ManagedHandler.cs

-                {
-                    _proxy = WebRequest.DefaultWebProxy;
-                }
+                //Need check what is the netstandard replacement for this


Last I checked there wasn't a good one but if you find it that would be great.

Yeah, there isn't an option yet:

I'm not sure that it will be available in netstandard2.0

galvesribeiro · 2017-01-09T23:59:36Z

@jterry75 Please check my comments. I'm just waiting the decision if will stay on net45 or if we are able to support net46+ to make all other changes.

galvesribeiro · 2017-01-10T20:27:44Z

@jterry75 @jstarks can I proceed? What are the recommendations (besides ones in the review)?

jterry75 · 2017-01-11T18:23:55Z

@galvesribeiro - Talked to @jstarks, we need to keep the support for .NET 45 and .NET 46 for now so can we put the #ifdef's back?

galvesribeiro · 2017-01-11T19:24:55Z

@jterry75 Ok, absolutely. Will put the #if back and also do a multitarget build along with all the changes you requested, no problem.

galvesribeiro · 2017-01-14T19:24:14Z

Hey @jterry75, it is done. Sorry for the delay. All feedback was addressed. The only thing that I don't know much is that AppVeyor version #. I never used AppVeyor before, so I appreciate any guidance on change that script to get the proper version.

Please let me know if you need anything else. Once I had it merged I'll tackle the other tasks.

Thanks

galvesribeiro · 2017-01-17T19:06:07Z

@jterry75 can we move forward? I want to finish this one to get moving to the other PRs.

jterry75 · 2017-01-17T19:37:19Z

LGTM. 1 question before merge. Do we have to have a .nuspec and a .csproj? The .csproj file includes all the nuget info already. Seems like duplicate work

galvesribeiro · 2017-01-17T19:48:52Z

@jterry75 the idea is to use only the .csproj however, we can't (yet) have a project that is at development time referencing another and at production referencing a nuget package (i.e X509 and BasicAuth that references the Docker.DotNet). I left the project pre-ready to be stand alone. While we are waiting for it to work from the .Net SDK team. We will remove later on the .nuspec and keep the .csproj only.

jterry75 · 2017-01-17T20:06:26Z

Ok cool.

jterry75 · 2017-01-17T20:08:13Z

Thanks! Merged this

galvesribeiro · 2017-01-17T20:08:24Z

Moving on :)

msftclas added the cla-already-signed label Jan 9, 2017

galvesribeiro mentioned this pull request Jan 9, 2017

error MSB3105: The item "XXX.cs" was specified more than once in the "Sources" parameter. dotnet/sdk#604

Closed

Move to netstandard1.3 and migrate all projects

c993770

jterry75 suggested changes Jan 9, 2017

View reviewed changes

galvesribeiro added 2 commits January 14, 2017 16:17

Addressed all feedback

effd139

Fix nuget packages

584ddae

galvesribeiro changed the title ~~Move to netstandard1.3 and migrate projects to latest tooling.~~ Move to MSBuild tooling Jan 14, 2017

fix build script

16331d7

jterry75 approved these changes Jan 17, 2017

View reviewed changes

jterry75 merged commit 9a740b5 into dotnet:master Jan 17, 2017

galvesribeiro deleted the msbuild branch January 17, 2017 20:08

		@@ -0,0 +1,21 @@
		<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

Move to MSBuild tooling #144

Move to MSBuild tooling #144

Conversation

galvesribeiro commented Jan 9, 2017

msftclas commented Jan 9, 2017

galvesribeiro commented Jan 9, 2017 • edited Loading

galvesribeiro commented Jan 9, 2017 • edited Loading

jterry75 commented Jan 9, 2017

galvesribeiro commented Jan 9, 2017

jterry75 commented Jan 9, 2017

jterry75 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

galvesribeiro commented Jan 9, 2017

galvesribeiro commented Jan 10, 2017

jterry75 commented Jan 11, 2017

galvesribeiro commented Jan 11, 2017

galvesribeiro commented Jan 14, 2017

galvesribeiro commented Jan 17, 2017

jterry75 commented Jan 17, 2017

galvesribeiro commented Jan 17, 2017 • edited Loading

jterry75 commented Jan 17, 2017

jterry75 commented Jan 17, 2017

galvesribeiro commented Jan 17, 2017

galvesribeiro commented Jan 9, 2017 •

edited

Loading

galvesribeiro commented Jan 9, 2017 •

edited

Loading

galvesribeiro commented Jan 17, 2017 •

edited

Loading