Source-build fixups
This commit is contained in:
parent
8460e80d1a
commit
3ffbd85ba1
3 changed files with 3 additions and 49 deletions
|
@ -151,9 +151,9 @@
|
||||||
<Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha>
|
<Sha>41abc5629965e3f9e41f1e67fdf78345c0c5cc4b</Sha>
|
||||||
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="msbuild" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="NuGet.Build.Tasks" Version="6.0.2-rc.3" CoherentParentDependency="Microsoft.NET.Sdk">
|
<Dependency Name="NuGet.Build.Tasks" Version="6.2.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
|
||||||
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
|
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
|
||||||
<Sha>75551652b352f860ea0b29095b64fa63715dd672</Sha>
|
<Sha>a8942f45835ba527cedacc02f7a75468f7a7b4bd</Sha>
|
||||||
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chris Rummel <crummel@microsoft.com>
|
|
||||||
Date: Wed, 22 Jun 2022 05:50:57 -0500
|
|
||||||
Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the
|
|
||||||
checked-in tarball.
|
|
||||||
|
|
||||||
---
|
|
||||||
eng/SourceBuild.props | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
|
||||||
index 6cc8501..a862003 100644
|
|
||||||
--- a/eng/SourceBuild.props
|
|
||||||
+++ b/eng/SourceBuild.props
|
|
||||||
@@ -15,7 +15,7 @@
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Exec
|
|
||||||
- Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
|
||||||
+ Command="git --work-tree=$(RepoRoot) apply --ignore-whitespace --whitespace=nowarn --unsafe-paths "%(SourceBuildPatchFile.FullPath)""
|
|
||||||
WorkingDirectory="$(RepoRoot)"
|
|
||||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
|
||||||
</Target>
|
|
|
@ -1,23 +0,0 @@
|
||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Chris Rummel <crummel@microsoft.com>
|
|
||||||
Date: Wed, 22 Jun 2022 05:57:36 -0500
|
|
||||||
Subject: [PATCH] Enable work-tree and unsafe-paths to be able to apply in the
|
|
||||||
checked-in tarball.
|
|
||||||
|
|
||||||
---
|
|
||||||
eng/SourceBuild.props | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
|
|
||||||
index b365645..36a7ba9 100644
|
|
||||||
--- a/eng/SourceBuild.props
|
|
||||||
+++ b/eng/SourceBuild.props
|
|
||||||
@@ -24,7 +24,7 @@
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<Exec
|
|
||||||
- Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)""
|
|
||||||
+ Command="git --work-tree=$(InnerSourceBuildRepoRoot) apply --ignore-whitespace --whitespace=nowarn --unsafe-paths "%(SourceBuildPatchFile.FullPath)""
|
|
||||||
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
|
|
||||||
Condition="'@(SourceBuildPatchFile)' != ''" />
|
|
||||||
</Target>
|
|
Loading…
Add table
Reference in a new issue