Skip to content
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

Moving patch fixes from placeholder branch to rel/2.0.1 #626

Merged
merged 13 commits into from Sep 25, 2017

Conversation

prafullbhosale
Copy link
Contributor

Issues addressed (along with the approved PRs) :

#587 --> #597
#588 --> #596
#601 --> #605

cc @Eilon @mlorbetske

@Eilon
Copy link
Member

Eilon commented Sep 20, 2017

Adding @natemcmaster and @JunTaoLuo to review and to make sure the patch infrastructure sees this branch.

<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\Shared.proj" />
<PropertyGroup>
<RuntimeIdentifier>win-arm</RuntimeIdentifier>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you tried using just one csproj instead? You can specified multiple RIDs in one file.

<RuntimeIdentifiers>win-arm;win-arm64;win7-x86</RuntimeIdentifiers>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wasn't able to get it to work with RuntimeIdentifiers. Don't recall exactly what the problem was at the time.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine. Was just wondering if you were aware this was an option.

@@ -0,0 +1,17 @@
<Project>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: it's MSBuild convention use the .props extension instead of .proj. This file is only intended to be used via Import, and not invoked directly.

@natemcmaster
Copy link
Contributor

We should be ok on infrastructure. Universe is already set to build rel/2.0.1 of this repo.

Copy link
Contributor

@natemcmaster natemcmaster left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit: when CI is green

@natemcmaster
Copy link
Contributor

AppVeyor is failing to build

[C:\projects\scaffolding\src\Microsoft.VisualStudio.Web.CodeGeneration.Design\Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj]
C:\Users\appveyor\.dotnet\x64\sdk\2.0.0\Sdks\NuGet.Build.Tasks.Pack\buildCrossTargeting\NuGet.Build.Tasks.Pack.targets(141,5): error : Could not find a part of the path 'C:\projects\scaffolding\tools\Microsoft.VisualStudio.Web.CodeGeneration.Design-x86\bin\Release\net461\win7-x86'. 

Known issue?

@prafullbhosale prafullbhosale merged commit 8d3e755 into rel/2.0.1 Sep 25, 2017
@prafullbhosale prafullbhosale deleted the placeholder branch September 25, 2017 18:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants