Skip to content

Update package baseline #14535

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

Merged
merged 2 commits into from
Oct 1, 2019
Merged

Update package baseline #14535

merged 2 commits into from
Oct 1, 2019

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Sep 27, 2019

Contributes to #12702

The update to Baseline.xml is manual - I added all packages that AspNetCore shipped in 3.0 GA, but picked only 1 version of the shared framework package (Microsoft.AspNetCore.App.runtime-winx64). The update to Basline.Designer.props was done by running the BaselineGenerator project.

Replaces #14437

@wtgodbe wtgodbe requested review from analogrelay and a team September 27, 2019 20:49
@wtgodbe
Copy link
Member Author

wtgodbe commented Sep 27, 2019

Interesting:

F:\workspace_work\1\s\src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj(182,5): error MSB3073: The command "C:\Windows\System32\tar.exe -czf F:\workspace_work\1\s\artifacts\installers\Release\aspnetcore-targeting-pack-3.0.0.tar.gz ." exited with code 9009.

Implies that C:\Windows\System32\tar.exe does exist, given 4165a02.

EDIT - whoops, never mind, I missed updating the ref proj.

@dougbu dougbu closed this Sep 28, 2019
Copy link
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

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

Once things work, go for it

Please file the follow-up bug about improving the baseline generator so that we can include the shared framework in the baseline

<TarCommand Condition="'$(OS)' == 'Windows_NT'">C:\Windows\System32\tar.exe</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists($(TarCommand))">'C:\Program Files\Git\usr\bin\tar.exe'</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists($(TarCommand))">'C:\Program Files (x86)\Git\usr\bin\tar.exe'</TarCommand>
<TarCommand Condition="'$(OS)' != 'Windows_NT'">tar</TarCommand>
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
<TarCommand Condition="'$(OS)' != 'Windows_NT'">tar</TarCommand>
<TarCommand>tar</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT'">C:\Windows\System32\tar.exe</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists('$(TarCommand)')">C:\Program Files\Git\usr\bin\tar.exe</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists('$(TarCommand)')">C:\Program Files (x86)\Git\usr\bin\tar.exe</TarCommand>

Single quotes aren't going to work w/ cmd but are useful when calling Exists(...). And, this simplifies things a bit.

@@ -175,7 +183,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
Overwrite="true" />
<!-- Requires Windows 10 version 1803 or newer -->
<Exec
Command="tar -czf $(TarArchiveOutputPath) ."
Command="$(TarCommand) -czf $(TarArchiveOutputPath) ."
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Command="$(TarCommand) -czf $(TarArchiveOutputPath) ."
Command="&quot;$(TarCommand)&quot; -czf $(TarArchiveOutputPath) ."

Quotes are also great in <Exec /> 😺

<TarCommand Condition="'$(OS)' == 'Windows_NT'">C:\Windows\System32\tar.exe</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists($(TarCommand))">'C:\Program Files\Git\usr\bin\tar.exe'</TarCommand>
<TarCommand Condition="'$(OS)' == 'Windows_NT' and !Exists($(TarCommand))">'C:\Program Files (x86)\Git\usr\bin\tar.exe'</TarCommand>
<TarCommand Condition="'$(OS)' != 'Windows_NT'">tar</TarCommand>
Copy link
Contributor

Choose a reason for hiding this comment

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

Same deal as the other project

@dougbu dougbu reopened this Sep 28, 2019
@dougbu
Copy link
Contributor

dougbu commented Sep 28, 2019

Not sure what I hit to close this. Entirely unintended.

@dougbu
Copy link
Contributor

dougbu commented Sep 28, 2019

Previous build got tar from git but the single-quotes messed it up:

The filename, directory name, or volume label syntax is incorrect.
F:\workspace\_work\1\s\src\Framework\ref\Microsoft.AspNetCore.App.Ref.csproj(185,5): error MSB3073: The command "'C:\Program Files (x86)\Git\usr\bin\tar.exe' -czf F:\workspace\_work\1\s\artifacts\installers\Release\aspnetcore-targeting-pack-3.0.0.tar.gz ." exited with code 123.

BTW one of @alexperovich's theories was that the agents were inconsistent. He found tar on $env:Path in at least some of the agents.

dougbu added a commit that referenced this pull request Sep 28, 2019
- thanks @wtgodbe for the inspiration in #14535
@dougbu
Copy link
Contributor

dougbu commented Sep 28, 2019

FYI I stole a variant of your tar workaround in #14404

@Pilchie Pilchie added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Sep 30, 2019
@wtgodbe wtgodbe merged commit db40877 into release/3.0 Oct 1, 2019
@ghost ghost deleted the Baseline30 branch October 1, 2019 19:14
@analogrelay analogrelay added this to the 3.0.1 milestone Nov 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants