Skip to content

Conditionally override PackageVersions in coreclr #1336

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.

Sign up for GitHub

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
dseefeld merged 1 commit into from
Nov 1, 2019
Merged

Conditionally override PackageVersions in coreclr #1336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 44 additions & 0 deletions patches/coreclr/0002-Conditionally-override-PackageVersion-properties.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From f2b6e2f828479800e27638d7a5cde7e0e4bb3f8e Mon Sep 17 00:00:00 2001
From: dseefeld <[email protected]>
Date: Thu, 31 Oct 2019 14:48:46 +0000
Subject: [PATCH] Conditionally override PackageVersion properties

---
dependencies.props | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dependencies.props b/dependencies.props
index 774b169..dc7afc0 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -22,12 +22,12 @@

<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
- <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
- <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
- <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
- <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
- <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
- <CommandLineParserVersion>2.2.0</CommandLineParserVersion>
+ <MicrosoftNETCoreRuntimeCoreCLRPackageVersion Condition="'$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)' == ''">3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
+ <XunitPackageVersion Condition="'$(XunitPackageVersion)' == ''">2.4.1-pre.build.4059</XunitPackageVersion>
+ <XunitPerformanceApiPackageVersion Condition="'$(XunitPerformanceApiPackageVersion)' == ''">1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
+ <MicrosoftDiagnosticsTracingTraceEventPackageVersion Condition="'$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)' == ''">2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
+ <MicrosoftDiagnosticsToolsRuntimeClientVersion Condition="'$(MicrosoftDiagnosticsToolsRuntimeClientVersion)' == ''">1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
+ <CommandLineParserVersion Condition="'$(CommandLineParserVersion)' == ''">2.2.0</CommandLineParserVersion>

<!-- Scenario tests install this version of Microsoft.NetCore.App, then patch coreclr binaries via xcopy. At the moment it is
updated manually whenever breaking changes require it to move forward, but it would be nice if we could update it automatically
@@ -45,7 +45,7 @@
<!-- ILLink.Tasks package version -->
<PropertyGroup>
<ILLinkTasksPackage>ILLink.Tasks</ILLinkTasksPackage>
- <ILLinkTasksPackageVersion>0.1.5-preview-1461378</ILLinkTasksPackageVersion>
+ <ILLinkTasksPackageVersion Condition="'$(ILLinkTasksPackageVersion)' == ''">0.1.5-preview-1461378</ILLinkTasksPackageVersion>
</PropertyGroup>

<ItemGroup>
--
1.8.3.1