Bump to mono/LineEditor/v5.4.1@3fa0c2eb #740
Merged
Conversation
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
jonpryor
force-pushed
the
jonp-bump-mt-5.4.1
branch
from
e9e622d
to
fd36d04
Compare
jonpryor
changed the title
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Oct 19, 2020
Context: dotnet/java-interop#740 Does It Build™?!
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Oct 19, 2020
Context: dotnet/java-interop#740 Does It Build™?!
|
DO NOT MERGE until this PR is acceptable: dotnet/android#5224 |
|
@dellis1972 , @jonathanpeppers : what is the proper way to use diff --git a/tools/logcat-parse/logcat-parse.csproj b/tools/logcat-parse/logcat-parse.csproj
index a7d4e1c3..7fb258e2 100644
--- a/tools/logcat-parse/logcat-parse.csproj
+++ b/tools/logcat-parse/logcat-parse.csproj
@@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Mono.Options" Version="5.3.0.1" />
- <PackageReference Include="Mono.Terminal" Version="5.4.1" />
+ <PackageReference Include="Mono.Terminal" Version="5.4.1" GeneratePathProperty="True" />
<PackageReference Include="Mono.CSharp" Version="4.0.0.143" NoWarn="NU1701" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
</ItemGroup>
@@ -22,4 +22,21 @@
<ProjectReference Include="..\..\src\Java.Interop.Tools.Diagnostics\Java.Interop.Tools.Diagnostics.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <_ExtraPackageSource Include="$(PkgMono_Terminal)\lib\netstandard2.0\LineEditor.pdb" />
+ <_ExtraPackageTarget Include="$(OutputPath)\LineEditor.pdb" />
+ </ItemGroup>
+
+ <!-- Copy package ref symbols for our installers. '$(Pkg*)' props are set during NuGet restore when GeneratePathProperty="true" -->
+ <Target Name="_CopyExtraPackageContent"
+ AfterTargets="Build"
+ Inputs="$(PkgMono_Terminal)\lib\netstandard2.0\LineEditor.pdb"
+ Outputs="$(OutputPath)\LineEditor.pdb" >
+ <Copy
+ SourceFiles="@(_ExtraPackageSource)"
+ DestinationFolder="$(OutputPath)"
+ SkipUnchangedFiles="True"
+ />
+ </Target>
+
</Project> |
jonpryor
force-pushed
the
jonp-bump-mt-5.4.1
branch
from
fd36d04
to
60e34b3
Compare
jonpryor
added a commit
to jonpryor/xamarin-android
that referenced
this pull request
Oct 20, 2020
Context: dotnet/java-interop#740 Does It Build™?!
Comment on lines
6
to
7
| Inputs="$(PkgMono_Terminal)\lib\netstandard2.0\LineEditor.pdb" | ||
| Outputs="$(OutputPath)\LineEditor.pdb" > |
There was a problem hiding this comment.
I think for these Inputs / Outputs to work, you would need a <Touch/>. The destination file will have the same last write time as the source file when using <Copy/>.
Since you are also using SkipUnchangedFiles="true", another option is to just remove the Inputs / Outputs because you probably don't need both.
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1230070 Changes: mono/LineEditor@5a7e3e2...3fa0c2e * mono/LineEditor@3fa0c2e: Fix NuGet publishing errors (dotnet#9) * mono/LineEditor@06a4ddf: Bump `$(PackageVersion)` to 5.4.1. * mono/LineEditor@bce1b7f: Enable .pdb files for Release config & add AzDO build script (dotnet#8) * mono/LineEditor@4831e1a: Merge pull request dotnet#6 from terrajobst/code-of-conduct * mono/LineEditor@5b4a4aa: Link Code of Conduct * mono/LineEditor@410ca3d: Merge pull request dotnet#2 from VEIT-Electronics/master * mono/LineEditor@3d802e7: Merge pull request dotnet#1 from VEIT-Electronics/bugfix/ENG-232-line-editor-completions * mono/LineEditor@0d43552: fix: text overriding was only platform specific (check platform) The most important piece is mono/LineEditor@bce1b7f, which will allow us to redistribute `LineEditor.pdb` in the Xamarin.Android installers. Add a post-`Build` target to `logcat-parse/Directory.Build.targets` which copies `LineEditor.pdb` into `$(OutputPath)`. This will allow the Xamarin.Android installer to include `LineEditor.pdb` into the installer packages.
jonpryor
force-pushed
the
jonp-bump-mt-5.4.1
branch
from
60e34b3
to
21d905f
Compare
jonathanpeppers
approved these changes
Oct 20, 2020
pjcollins
pushed a commit
to pjcollins/java.interop
that referenced
this pull request
Dec 17, 2020
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1230070 Changes: mono/LineEditor@5a7e3e2...3fa0c2e * mono/LineEditor@3fa0c2e: Fix NuGet publishing errors (dotnet#9) * mono/LineEditor@06a4ddf: Bump `$(PackageVersion)` to 5.4.1. * mono/LineEditor@bce1b7f: Enable .pdb files for Release config & add AzDO build script (dotnet#8) * mono/LineEditor@4831e1a: Merge pull request dotnet#6 from terrajobst/code-of-conduct * mono/LineEditor@5b4a4aa: Link Code of Conduct * mono/LineEditor@410ca3d: Merge pull request dotnet#2 from VEIT-Electronics/master * mono/LineEditor@3d802e7: Merge pull request dotnet#1 from VEIT-Electronics/bugfix/ENG-232-line-editor-completions * mono/LineEditor@0d43552: fix: text overriding was only platform specific (check platform) The most important piece is mono/LineEditor@bce1b7f, which will allow us to redistribute `LineEditor.pdb` in the Xamarin.Android installers. Add a post-`Build` target to `logcat-parse/Directory.Build.targets` which copies `LineEditor.pdb` into `$(OutputPath)`. This will allow the Xamarin.Android installer to include `LineEditor.pdb` into the installer packages.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Context: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1230070
Changes: mono/LineEditor@5a7e3e2...3fa0c2e
$(PackageVersion)to 5.4.1.JavaException.InnerExceptionshould returnThrowable.getCause(). #1 from VEIT-Electronics/bugfix/ENG-232-line-editor-completionsThe most important piece is mono/LineEditor@bce1b7f, which will allow
us to redistribute
LineEditor.pdbin the Xamarin.Android installers.