This repository has been archived by the owner on Oct 27, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 33
Add local + ci for source-build build infra #416
Merged
dagood
merged 1 commit into
dotnet:master
from
omajid:arcade-powered-source-build-1-and-2
Feb 10, 2021
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<Project> | ||
|
||
<PropertyGroup> | ||
<GitHubRepositoryName>xliff-tasks</GitHubRepositoryName> | ||
<SourceBuildManagedOnly>true</SourceBuildManagedOnly> | ||
</PropertyGroup> | ||
|
||
<Target Name="ApplySourceBuildPatchFiles" | ||
Condition=" | ||
'$(ArcadeBuildFromSource)' == 'true' and | ||
'$(ArcadeInnerBuildFromSource)' == 'true'" | ||
BeforeTargets="Execute"> | ||
<ItemGroup> | ||
<SourceBuildPatchFile Include="$(RepositoryEngineeringDir)source-build-patches\*.patch" /> | ||
</ItemGroup> | ||
|
||
<Exec | ||
Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)"" | ||
WorkingDirectory="$(RepoRoot)" | ||
Condition="'@(SourceBuildPatchFile)' != ''" /> | ||
</Target> | ||
|
||
</Project> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<UsageData> | ||
<IgnorePatterns> | ||
<UsagePattern IdentityGlob="*/*" /> | ||
</IgnorePatterns> | ||
</UsageData> |
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
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
54 changes: 54 additions & 0 deletions
54
eng/source-build-patches/0001-remove-netcoreapp2.1-targets.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
From 61101604c89260e680df2d0e52c2dce84629ba00 Mon Sep 17 00:00:00 2001 | ||
From: Tom Deseyn <tom.deseyn@gmail.com> | ||
Date: Thu, 19 Nov 2020 20:06:23 +0100 | ||
Subject: [PATCH] xliff-tasks: remove netcoreapp2.1 targets | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This patch originally bumped from There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
|
||
--- | ||
src/XliffTasks/XliffTasks.csproj | 6 ++---- | ||
src/XliffTasks/build/XliffTasks.targets | 2 +- | ||
2 files changed, 3 insertions(+), 5 deletions(-) | ||
|
||
diff --git a/src/XliffTasks/XliffTasks.csproj b/src/XliffTasks/XliffTasks.csproj | ||
index d967ac3..340b458 100644 | ||
--- a/src/XliffTasks/XliffTasks.csproj | ||
+++ b/src/XliffTasks/XliffTasks.csproj | ||
@@ -4,10 +4,9 @@ | ||
|
||
<PropertyGroup> | ||
<TargetFrameworks>netcoreapp2.1;net46</TargetFrameworks> | ||
- <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.1</TargetFrameworks> | ||
+ <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net5.0</TargetFrameworks> | ||
<BuildOutputTargetFolder>tools</BuildOutputTargetFolder> | ||
<EnableDefaultItems>false</EnableDefaultItems> | ||
- <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> | ||
<IsPackable>true</IsPackable> | ||
<PackageLicenseExpression>MIT</PackageLicenseExpression> | ||
<LangVersion>7.2</LangVersion> | ||
@@ -23,10 +22,9 @@ | ||
<InternalsVisibleTo Include="XliffTasks.Tests" /> | ||
</ItemGroup> | ||
|
||
- <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> | ||
+ <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'"> | ||
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.1012" PrivateAssets="All" /> | ||
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.1012" PrivateAssets="All" /> | ||
- <PackageReference Include="Microsoft.NETCore.App" Version="2.0.0" PrivateAssets="All" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup Condition="'$(TargetFramework)' == 'net46'"> | ||
diff --git a/src/XliffTasks/build/XliffTasks.targets b/src/XliffTasks/build/XliffTasks.targets | ||
index a79dae2..d5498c2 100644 | ||
--- a/src/XliffTasks/build/XliffTasks.targets | ||
+++ b/src/XliffTasks/build/XliffTasks.targets | ||
@@ -4,7 +4,7 @@ | ||
<Project> | ||
|
||
<PropertyGroup> | ||
- <XliffTasksDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\</XliffTasksDirectory> | ||
+ <XliffTasksDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\</XliffTasksDirectory> | ||
<XliffTasksDirectory Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net46\</XliffTasksDirectory> | ||
<XliffTasksAssembly>$(XliffTasksDirectory)XliffTasks.dll</XliffTasksAssembly> | ||
</PropertyGroup> | ||
-- | ||
2.26.2 | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not **/*? (recursive dirs)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on the docs here:
It seems to mean a
name/version
pair rather than a file glob.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, this matches the common NuGet identity representation
Microsoft.NETCore.App.Runtime/5.0.0
. (Typical nupkg filenames are ambiguous, using.
instead of/
.)