[release/6.0.1xx] Update dependencies from dotnet/arcade (#12349)
[release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Resolve conflicts in source-build patches - Resolve conflicts in source-build patches
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
a52a9ace2c
commit
e3a96ef1c7
6 changed files with 11 additions and 317 deletions
|
|
@ -197,28 +197,28 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21507.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21513.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e58cb829bf6d9c340b4a0c100956e2995d792aa2</Sha>
|
||||
<Sha>6f356ed4df5eebeb9000924b2b00a7b7a2f027a0</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21507.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21513.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e58cb829bf6d9c340b4a0c100956e2995d792aa2</Sha>
|
||||
<Sha>6f356ed4df5eebeb9000924b2b00a7b7a2f027a0</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21507.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21513.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>e58cb829bf6d9c340b4a0c100956e2995d792aa2</Sha>
|
||||
<Sha>6f356ed4df5eebeb9000924b2b00a7b7a2f027a0</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21514.2">
|
||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||
<Sha>83a56ff632506f3d41fae37165136c8c59e697a9</Sha>
|
||||
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21423-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/sourcelink</Uri>
|
||||
<Sha>6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9</Sha>
|
||||
<Sha>8031e5220baf2acad991e661d8308b783d2acf3e</Sha>
|
||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21507.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21513.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.16.4"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21507.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21507.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21513.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21513.3"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Davis Goodin <dagood@microsoft.com>
|
||||
Date: Fri, 8 Oct 2021 16:15:42 -0700
|
||||
Subject: [PATCH] Disable Workloads WiX dependency in source-build
|
||||
|
||||
This removes the prebuilt WiX dependency: https://github.com/dotnet/arcade/issues/8014
|
||||
|
||||
The patch is temporary, pending upstream fix and dependency flow.
|
||||
---
|
||||
.../src/{FileRow.cs => FileRow.wix.cs} | 0
|
||||
...ifestMsi.cs => GenerateManifestMsi.wix.cs} | 0
|
||||
.../{GenerateMsi.cs => GenerateMsi.wix.cs} | 0
|
||||
...erateMsiBase.cs => GenerateMsiBase.wix.cs} | 0
|
||||
...erateVisualStudioMsiPackageProject.wix.cs} | 0
|
||||
...cs => GenerateVisualStudioWorkload.wix.cs} | 0
|
||||
...oadMsis.cs => GenerateWorkloadMsis.wix.cs} | 0
|
||||
...rosoft.DotNet.Build.Tasks.Workloads.csproj | 23 ++++++++++++++++---
|
||||
...{MsiProperties.cs => MsiProperties.wix.cs} | 0
|
||||
.../src/{MsiUtils.cs => MsiUtils.wix.cs} | 0
|
||||
...elatedProduct.cs => RelatedProduct.wix.cs} | 0
|
||||
11 files changed, 20 insertions(+), 3 deletions(-)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{FileRow.cs => FileRow.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateManifestMsi.cs => GenerateManifestMsi.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsi.cs => GenerateMsi.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateMsiBase.cs => GenerateMsiBase.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioMsiPackageProject.cs => GenerateVisualStudioMsiPackageProject.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateVisualStudioWorkload.cs => GenerateVisualStudioWorkload.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{GenerateWorkloadMsis.cs => GenerateWorkloadMsis.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiProperties.cs => MsiProperties.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{MsiUtils.cs => MsiUtils.wix.cs} (100%)
|
||||
rename src/Microsoft.DotNet.Build.Tasks.Workloads/src/{RelatedProduct.cs => RelatedProduct.wix.cs} (100%)
|
||||
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/FileRow.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsi.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioMsiPackageProject.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
|
||||
index 19cf67b5..2d02b7f4 100644
|
||||
--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
|
||||
+++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
|
||||
@@ -11,6 +11,16 @@
|
||||
<NoWarn>$(NoWarn);NU5127</NoWarn>
|
||||
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
|
||||
<RootNamespace>Microsoft.DotNet.Build.Tasks.Workloads</RootNamespace>
|
||||
+
|
||||
+ <!--
|
||||
+ Only include WiX-powered features when running a non-from-source build. (For example, the
|
||||
+ Microsoft build used to build .NET for Windows.)
|
||||
+
|
||||
+ This removes a dependency on prebuilt WiX binaries. The purpose of WiX is to produce Windows
|
||||
+ installers, and source-build doesn't run on Windows, so excluding WiX while building in
|
||||
+ source-build mode to remove the prebuilt dependency has no impact to available .NET features.
|
||||
+ -->
|
||||
+ <IncludeWiX Condition="'$(DotNetBuildFromSource)' != 'true'">true</IncludeWiX>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -19,13 +29,16 @@
|
||||
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
|
||||
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
|
||||
<PackageReference Include="NuGet.Packaging" Version="$(NuGetVersion)" />
|
||||
- <PackageReference Include="Wix" Version="3.11.2" />
|
||||
<PackageReference Include="Microsoft.NET.Sdk.WorkloadManifestReader" Version="$(MicrosoftNetSdkWorkloadManifestReaderVersion)" />
|
||||
- <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" Condition="'$(TargetFramework)' == 'net472'"/>
|
||||
+ <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" Condition="'$(TargetFramework)' == 'net472'" />
|
||||
<PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
|
||||
</ItemGroup>
|
||||
|
||||
- <ItemGroup>
|
||||
+ <ItemGroup Condition="'$(IncludeWiX)' == 'true'">
|
||||
+ <PackageReference Include="Wix" Version="3.11.2" />
|
||||
+ </ItemGroup>
|
||||
+
|
||||
+ <ItemGroup Condition="'$(IncludeWiX)' == 'true'">
|
||||
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Resources.dll" />
|
||||
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.dll" />
|
||||
<Reference Include="$(WixInstallPath)\Microsoft.Deployment.Compression.Cab.dll" />
|
||||
@@ -48,6 +61,10 @@
|
||||
<EmbeddedResource Remove="obj\**" />
|
||||
</ItemGroup>
|
||||
|
||||
+ <ItemGroup Condition="'$(IncludeWiX)' != 'true'">
|
||||
+ <Compile Remove="**\*.wix.cs" />
|
||||
+ </ItemGroup>
|
||||
+
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="Misc\*.*" />
|
||||
<EmbeddedResource Include="MsiTemplate\*.wxs" />
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiProperties.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiUtils.wix.cs
|
||||
diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs
|
||||
similarity index 100%
|
||||
rename from src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.cs
|
||||
rename to src/Microsoft.DotNet.Build.Tasks.Workloads/src/RelatedProduct.wix.cs
|
||||
|
|
@ -1,156 +0,0 @@
|
|||
From aba2e21af6d299f0e5c04c7848e4971e0da0e5b5 Mon Sep 17 00:00:00 2001
|
||||
From: dseefeld <dseefeld@microsoft.com>
|
||||
Date: Tue, 20 Jul 2021 21:01:43 +0000
|
||||
Subject: [PATCH] Update TFMs to net6.0
|
||||
|
||||
When building from source, only the current TFM is built. Update
|
||||
TargetFrameworks to only have net6.0.
|
||||
---
|
||||
eng/Versions.props | 1 +
|
||||
src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj | 1 +
|
||||
.../Microsoft.SourceLink.AzureDevOpsServer.Git.csproj | 1 +
|
||||
.../Microsoft.SourceLink.AzureRepos.Git.csproj | 1 +
|
||||
.../Microsoft.SourceLink.Bitbucket.Git.csproj | 1 +
|
||||
src/SourceLink.Common/Microsoft.SourceLink.Common.csproj | 1 +
|
||||
src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj | 1 +
|
||||
src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj | 1 +
|
||||
src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj | 1 +
|
||||
src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj | 1 +
|
||||
src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj | 1 +
|
||||
11 files changed, 11 insertions(+)
|
||||
|
||||
diff --git a/eng/Versions.props b/eng/Versions.props
|
||||
index 4ea51a8..eff58cf 100644
|
||||
--- a/eng/Versions.props
|
||||
+++ b/eng/Versions.props
|
||||
@@ -7,6 +7,7 @@
|
||||
<SemanticVersioningV1>true</SemanticVersioningV1>
|
||||
<!-- Opt-in repo features -->
|
||||
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
|
||||
+ <UsingToolNetFrameworkReferenceAssemblies Condition=" '$(DotNetBuildFromSource)' == 'true' ">false</UsingToolNetFrameworkReferenceAssemblies>
|
||||
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
|
||||
<XUnitVersion>2.4.1</XUnitVersion>
|
||||
<MicrosoftBuildVersion>16.7.0</MicrosoftBuildVersion>
|
||||
diff --git a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
|
||||
index 3fa8c71..da0277b 100644
|
||||
--- a/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
|
||||
+++ b/src/Microsoft.Build.Tasks.Git/Microsoft.Build.Tasks.Git.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- NuGet -->
|
||||
diff --git a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
|
||||
index ceec252..84e89bd 100644
|
||||
--- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
|
||||
+++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
|
||||
index bdb048e..b01b429 100644
|
||||
--- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
|
||||
+++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
|
||||
index bf27b3f..11ac33d 100644
|
||||
--- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
|
||||
+++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file since NuGet Pack target currently doesn't support including dependencies in tools packages -->
|
||||
diff --git a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
|
||||
index 09ac8ec..534b316 100644
|
||||
--- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
|
||||
+++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- NuGet -->
|
||||
diff --git a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
|
||||
index 626b9cc..0c025ca 100644
|
||||
--- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
|
||||
+++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
|
||||
index 4a1d0af..ada8986 100644
|
||||
--- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
|
||||
+++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
|
||||
index 19f92a8..b9ec7b4 100644
|
||||
--- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
|
||||
+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
|
||||
index fa9e33e..acca3af 100644
|
||||
--- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
|
||||
+++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net472;net6.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
|
||||
|
||||
<!-- Using an explicit nuspec file due to https://github.com/NuGet/Home/issues/6754 -->
|
||||
diff --git a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
|
||||
index 5d17262..3dd091a 100644
|
||||
--- a/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
|
||||
+++ b/src/SourceLink.Tools/Microsoft.SourceLink.Tools.Package.csproj
|
||||
@@ -3,6 +3,7 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
|
||||
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
|
||||
<GenerateDocumentationFile>false</GenerateDocumentationFile>
|
||||
<DebugType>none</DebugType>
|
||||
<GenerateDependencyFile>false</GenerateDependencyFile>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 4c6179851c1e4ff7f6835707d11f0d9a411aefbc Mon Sep 17 00:00:00 2001
|
||||
From: Matt Galbraith <mattgal@microsoft.com>
|
||||
Date: Mon, 23 Aug 2021 08:52:35 -0700
|
||||
Subject: [PATCH] https://github.com/dotnet/arcade/issues/7778 - Ignore curl
|
||||
failures for no-network build scenario
|
||||
|
||||
---
|
||||
eng/common/tools.sh | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
|
||||
index 3c5f3a12..41e32310 100755
|
||||
--- a/eng/common/tools.sh
|
||||
+++ b/eng/common/tools.sh
|
||||
@@ -402,7 +402,7 @@ function StopProcesses {
|
||||
function TryLogClientIpAddress () {
|
||||
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
|
||||
if command -v curl > /dev/null; then
|
||||
- curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: '
|
||||
+ curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
|
||||
fi
|
||||
}
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue