mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[ArPow] Update source-build commit shas (#11710)

Browse source
This commit is contained in:
Michael Simons 2021-09-09 08:03:44 -05:00 • committed by GitHub
parent 1afc0b6892
commit 5b535217cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 316 additions and 947 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
eng/SourceBuild.Version.Details.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21355.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21455.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>71dd6b0c87d7619668a40876d084d93db57eab41</Sha>
<Sha>2f1f0072156f5029efc2bee047843aa82728af5c</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.21310.2">
@ -11,95 +11,95 @@
<Sha>3198bf5660cad3dab85f5475bf1fda9688146e3f</Sha>
<SourceBuild RepoName="clicommandlineparser" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="0.1.230801">
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.21417.2">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5e855e911de7c56fe28400c4500e888fe2a3da8e</Sha>
<Sha>bd9c63c9e74681617fccf2e371cd90f00d01cef7</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="5.0.0-preview.21325.1">
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.21430.7">
<Uri>https://github.com/dotnet/diagnostics</Uri>
<Sha>6f48c2ae749c29b687af0353e6c2a9590d7e3d22</Sha>
<Sha>e0189ea53737fbb0cc110dab56c260ef2a6f5b74</Sha>
<SourceBuild RepoName="diagnostics" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="5.0.3-beta.21352.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="6.0.0-beta.21456.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>3af67cd8ffd73b2dc443e1e24dc0cf28f7e1c608</Sha>
<Sha>29a1afe4e1c61e92cfaf63a8bfa56c464a83efc4</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21409.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21452.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/mono/linker</Uri>
<Sha>cb8d86607bcebd8cb3b0a1efe1472839ecdde1ca</Sha>
<Sha>8a5c446a84922bddccfcfc6d3cb5c117dc3babd4</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21330-06" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21453-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>cdc5faeda066a83b084c96b8a455ad0a5e8713ab</Sha>
<Sha>74e9935a4a2e0108343533b3445516ad111e87ea</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-preview.3.179" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-preview.4.230" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>7363366401b43f4ea250394db8dad3707e9a9636</Sha>
<Sha>fcb4b9a7fb52777ed3e740cda029f78813a988d9</Sha>
<SourceBuild RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-2.21356.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-5.21453.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>d16c8bd011951d9bd15809d9004276cf7baaa786</Sha>
<Sha>2bbf85baa30a90f9d491699734e814050356da32</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.3-beta1.21356.1">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21452.5">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>77c6f0725c26442023c8eee2b143b899cb3f4eb7</Sha>
<Sha>4c168e06ba2e4ba872a00f4d94acbb2090bd00b7</Sha>
<SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21356.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.2.21457.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>566b53a66b0afa573f0dae33d07c8de9685aa5c8</Sha>
<Sha>c300b096419523024f2b807ec9db3c2d91df0298</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.7.21362.11">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rc.2.21457.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>5fab7585de482237f470634489b969a1bd03e063</Sha>
<Sha>53638077fcb5b1a49246489c28b338a0fee104c7</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DiaSymReader" Version="1.4.0-beta2-21315-01">
<Dependency Name="Microsoft.DiaSymReader" Version="1.4.0-beta2-21410-02">
<Uri>https://github.com/dotnet/symreader</Uri>
<Sha>1968a003d845d119a9d38ac4daaeea22897f7daf</Sha>
<Sha>dd6b71744be8cdbfd69117e96f5b9e64a7b38b6e</Sha>
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100-preview.7.21329.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.100-rc.2.21456.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>3bc0d90f3e450f3e4ebda128081d091fb42968e3</Sha>
<Sha>b9bde7c2d1dc5eeb7f40d9bae864ebc3b0c3ed35</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21321.1">
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.0.2-beta4.21416.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>6898c1c70c2d14e9725ddab6e1ebe8084c4d7e27</Sha>
<Sha>baf4b38e4f1dbc637efdb41624acbe05b2ff9f35</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21302.1">
<Dependency Name="Microsoft.Web.Xdt" Version="5.0.0-preview.21401.1">
<Uri>https://github.com/dotnet/xdt</Uri>
<Sha>6a46e7c886cdf499ba3433f665ab417be814135e</Sha>
<Sha>37469b9f38e7a56be04621f77b12a51ef49c1074</Sha>
<SourceBuild RepoName="xdt" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210629-04" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210817-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>e078bbadaf65628c313e97041973db52a84491ef</Sha>
<Sha>e79909063ddfc9d8fd4959e072b2dcf5e8d9d3c1</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21319.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a3377cccde8639089f99107e2ba5df2c8cbe6394</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21309-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21423-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc</Sha>
<Sha>6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21318.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build" Version="0.1.0-alpha.1.21318.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/source-build</Uri>
<Sha>3fb25b8db3bec654e37e71a5b2b7fde14444bc2f</Sha>
<SourceBuild RepoName="source-build" ManagedOnly="true" />
@ -109,9 +109,9 @@
<Sha>203ced7252f5104d13b83bf446a6c6dea827b673</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="XliffTasks" Version="1.0.0-beta.21325.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21426.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>71c811561ad4dcf46825a5077fbcc668ab74754f</Sha>
<Sha>22d8cfd8807ba8e4f2e32eeb9f207010ca5e6f6d</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview1.1.21112.1" CoherentParentDependency="Microsoft.NET.Sdk">

9
src/SourceBuild/tarball/content/TemporaryBootstrapPackageVersions.props
View file

@ -12,11 +12,12 @@
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.6.21352.12</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsVersion>3.1.0</MicrosoftNETCorePlatformsVersion>
<SystemCollectionsImmutablePackageVersion>6.0.0-preview.6.21352.12</SystemCollectionsImmutablePackageVersion>
<SystemCollectionsImmutableVersion>6.0.0-preview.6.21352.12</SystemCollectionsImmutableVersion>
<SystemCollectionsImmutablePackageVersion>6.0.0-preview.7.21377.19</SystemCollectionsImmutablePackageVersion>
<SystemCollectionsImmutableVersion>6.0.0-preview.7.21377.19</SystemCollectionsImmutableVersion>
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
<SystemReflectionMetadataPackageVersion>5.0.0</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0-preview.7.21321.2</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21321.2</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>6.0.0-rc.1.21415.6</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.1.21415.6</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.7.21356.2</SystemSecurityPermissionsPackageVersion>
</PropertyGroup>
</Project>

2
src/SourceBuild/tarball/content/global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.100-preview.6.21355.2"
"dotnet": "6.0.100-rc.2.21426.20"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",

2
src/SourceBuild/tarball/content/patches/arcade/0001-Update-TFM-to-net6.0.patch
View file

@ -76,9 +76,9 @@ index 2f35e4aa..dfe69f4c 100644
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net472</TargetFrameworks>
+ <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</TargetFrameworks>
<ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
<PackageType>MSBuildSdk</PackageType>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IsPackable>true</IsPackable>
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj b/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj
index 4405a1fe..a93edfaa 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/Microsoft.DotNet.SharedFramework.Sdk.csproj

26
src/SourceBuild/tarball/content/patches/arcade/0005-Patch-sdk.props-to-target-net6.0.patch Normal file
View file

@ -0,0 +1,26 @@
From 676bb5aa455dcf877c78792e4e5a62ca6a1d72c1 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 16:43:11 +0000
Subject: [PATCH] Patch sdk.props to target net6.0
Workaround for https://github.com/dotnet/arcade/issues/7413
---
src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
index e3c50582..a577f923 100644
--- a/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
+++ b/src/Microsoft.DotNet.SharedFramework.Sdk/sdk/Sdk.props
@@ -8,7 +8,7 @@
-->
<PropertyGroup Condition="'$(DotNetSharedFrameworkTaskDir)' == ''">
- <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/netcoreapp3.1/</DotNetSharedFrameworkTaskDir>
+ <DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' == 'core'">$(MSBuildThisFileDirectory)../tools/net6.0/</DotNetSharedFrameworkTaskDir>
<DotNetSharedFrameworkTaskDir Condition="'$(MSBuildRuntimeType)' != 'core'">$(MSBuildThisFileDirectory)../tools/net472/</DotNetSharedFrameworkTaskDir>
</PropertyGroup>
--
2.29.2

61
src/SourceBuild/tarball/content/patches/aspnetcore/0001-Run-GenerateFiles-during-source-build.patch
View file

@ -1,61 +0,0 @@
From db187e95f62d9bff268e68f39b441b6da8be9111 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 2 Aug 2021 19:02:27 +0000
Subject: [PATCH] Run GenerateFiles during source build
GenerateFiles is not running in source build yet the outputs are required.
These changes get GenerateFiles to run as part of source build.
These changes also turn on the binaryLog option while building the RepoTasks during source build.
---
eng/SourceBuild.props | 3 +--
eng/Tools.props | 2 +-
eng/tools/GenerateFiles/GenerateFiles.csproj | 1 +
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 27cbe92036..3dbfe2ce7e 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -1,5 +1,4 @@
<Project>
-
<PropertyGroup>
<GitHubRepositoryName>aspnetcore</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
@@ -47,7 +46,7 @@
BeforeTargets="Execute">
<Exec
- Command="./eng/build.sh --only-build-repo-tasks"
+ Command="./eng/build.sh --only-build-repo-tasks -bl"
WorkingDirectory="$(InnerSourceBuildRepoRoot)"
EnvironmentVariables="@(InnerBuildEnv)" />
</Target>
diff --git a/eng/Tools.props b/eng/Tools.props
index a285c2406a..a38257f770 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -13,7 +13,7 @@
<!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
<Target Name="GenerateDirectoryBuildFiles"
AfterTargets="Restore"
- Condition=" '$(DotNetBuildFromSource)' != 'true' AND '$(MSBuildRuntimeType)' == 'core' ">
+ Condition=" '$(MSBuildRuntimeType)' == 'core' ">
<!-- Separate invocations and use different properties to ensure second can load the restored package info. -->
<MSBuild Projects="$(RepoRoot)eng\tools\GenerateFiles\GenerateFiles.csproj"
RemoveProperties="BaseIntermediateOutputPath"
diff --git a/eng/tools/GenerateFiles/GenerateFiles.csproj b/eng/tools/GenerateFiles/GenerateFiles.csproj
index 0ae5c9753e..dbf9965bf9 100644
--- a/eng/tools/GenerateFiles/GenerateFiles.csproj
+++ b/eng/tools/GenerateFiles/GenerateFiles.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<!-- Use fixed version instead of $(DefaultNetCoreTargetFramework) to avoid needing workarounds set up here. -->
<TargetFramework>net5.0</TargetFramework>
+ <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
--
2.29.2

28
src/SourceBuild/tarball/content/patches/aspnetcore/0002-Use-Versions.props-MicrosoftExtensionsDependencyMode.patch
View file

@ -1,28 +0,0 @@
From 14992fbe4d8f433025cc45be81ef0035ed77221b Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 2 Aug 2021 13:40:03 +0000
Subject: [PATCH] Use Versions.props MicrosoftExtensionsDependencyModelVersion
in RepoTasks
Source build is loading a reference assembly which fails when the RepoTasks are invoked.
This change gets source build to use the version which is source built.
---
eng/tools/RepoTasks/RepoTasks.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index e723beb353..67e01850f8 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
- <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
--
2.29.2

36
src/SourceBuild/tarball/content/patches/aspnetcore/0005-Add-installer-artifacts-to-source-build-intermediate.patch
View file

@ -1,36 +0,0 @@
From a5620750c0d6c6fd8652daf7064fbc3622b6d320 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 16 Aug 2021 16:49:27 +0000
Subject: [PATCH] Add installer artifacts to source build intermediate
---
eng/SourceBuild.props | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 5c714e42c4..e7024a7707 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -60,4 +60,19 @@
</PropertyGroup>
</Target>
+ <Target Name="GetAspnetcoreCategorizedIntermediateNupkgContents"
+ BeforeTargets="GetCategorizedIntermediateNupkgContents">
+ <PropertyGroup>
+ <InstallersArtifactsDir>$(CurrentRepoSourceBuildArtifactsDir)\installers\$(Configuration)\</InstallersArtifactsDir>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <!--
+ Add the internal installers artifacts required by dotnet/installer.
+ -->
+ <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore-runtime-internal-*.tar.gz" />
+ <IntermediateNupkgArtifactFile Include="$(InstallersArtifactsDir)aspnetcore_base_runtime.version" />
+ </ItemGroup>
+ </Target>
+
</Project>
--
2.29.2

2
src/SourceBuild/tarball/content/patches/nuget-client/0002-Update-netcoreapp-TFMs-to-6.0.patch
View file

@ -32,9 +32,9 @@ index 80433ed60..8acc4e0bb 100644
<TargetFrameworksLibrary Condition="'$(IsBuildOnlyXPLATProjects)' == 'true'">$(NetStandardVersion)</TargetFrameworksLibrary>
- <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);netcoreapp5.0</TargetFrameworksLibraryForSigning>
+ <TargetFrameworksLibraryForSigning>$(TargetFrameworksLibrary);net6.0</TargetFrameworksLibraryForSigning>
<TargetFrameworksLibraryForCrossVerificationTests>$(NETFXTargetFramework);netcoreapp5.0</TargetFrameworksLibraryForCrossVerificationTests>
<RepositoryRootDirectory>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'README.md'))\</RepositoryRootDirectory>
<BuildCommonDirectory>$(RepositoryRootDirectory)build\</BuildCommonDirectory>
<SolutionFile>$(RepositoryRootDirectory)$(RepositoryName).sln</SolutionFile>
diff --git a/build/common.targets b/build/common.targets
index cf5a70c62..8827686a7 100644
--- a/build/common.targets

16
src/SourceBuild/tarball/content/patches/nuget-client/0006-Upgrade-to-.NET-6-SDK.patch
View file

@ -7,11 +7,10 @@ Subject: [PATCH 2/2] Upgrade to .NET 6 SDK.
.../NuGet.Commands/SignCommand/CertificateProvider.cs | 4 ++--
.../NuGet.Packaging/Signing/Authoring/SignPackageRequest.cs | 2 ++
src/NuGet.Core/NuGet.Packaging/Signing/Cms/NativeUtility.cs | 2 ++
src/NuGet.Core/NuGet.Protocol/Converters/JsonExtensions.cs | 2 +-
.../HttpSource/HttpRequestMessageExtensions.cs | 6 +++---
.../NuGet.Protocol/HttpSource/HttpRetryHandler.cs | 2 +-
.../HttpSource/HttpSourceAuthenticationHandler.cs | 2 +-
7 files changed, 12 insertions(+), 8 deletions(-)
6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs b/src/NuGet.Core/NuGet.Commands/SignCommand/CertificateProvider.cs
index c6ea71243..beac41889 100644
@ -63,19 +62,6 @@ index 565ac60b7..d57e38a65 100644
signerInfo.HashAlgorithm.pszObjId = cmsSigner.DigestAlgorithm.Value;
if (cmsSigner.SignerIdentifierType == SubjectIdentifierType.SubjectKeyIdentifier)
diff --git a/src/NuGet.Core/NuGet.Protocol/Converters/JsonExtensions.cs b/src/NuGet.Core/NuGet.Protocol/Converters/JsonExtensions.cs
index 53fcd4cbd..b77b634fd 100644
--- a/src/NuGet.Core/NuGet.Protocol/Converters/JsonExtensions.cs
+++ b/src/NuGet.Core/NuGet.Protocol/Converters/JsonExtensions.cs
@@ -23,7 +23,7 @@ public static class JsonExtensions
{
new NuGetVersionConverter(),
new VersionInfoConverter(),
- new StringEnumConverter { CamelCaseText = false },
+ new StringEnumConverter(),
new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal },
new FingerprintsConverter(),
new VersionRangeConverter()
diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs
index 7c9595268..1ca751850 100644
--- a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpRequestMessageExtensions.cs

25
src/SourceBuild/tarball/content/patches/roslyn-analyzers/0001-NoWarn-NU1605-until-previous-soure-built-is-updated.patch Normal file
View file

@ -0,0 +1,25 @@
From c0054516699c82ae2778cfef2391b054c803bcda Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 22:30:07 +0000
Subject: [PATCH] NoWarn NU1605 until previous soure built is updated
---
Directory.Build.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 2abead734..0447353dd 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -40,7 +40,7 @@
CS1591: Missing XML comment for publicly visible type or member 'Type_or_Member'
CS1712: Type parameter 'parameter' has no matching typeparam tag in the XML comment on 'type_or_member' (but other type parameters do)
-->
- <NoWarn Condition="'$(Language)' == 'C#'">$(NoWarn),1573,1591,1712</NoWarn>
+ <NoWarn Condition="'$(Language)' == 'C#'">$(NoWarn),1573,1591,1712;NU1605</NoWarn>
</PropertyGroup>
<PropertyGroup>
--
2.29.2

35
src/SourceBuild/tarball/content/patches/roslyn-analyzers/0001-Update-MSBuild-version-comparison-logic.patch
View file

@ -1,35 +0,0 @@
From 1b52503c9f6c6be4caf93081ae70b78aedc19dce Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 11 Aug 2021 21:38:05 +0000
Subject: [PATCH] Update MSBuild version comparison logic
Latest MicrosoftCodeAnalysisVersion is a semantic version which msbuild comparison operators do not support.
Updating to use the recommended version comparison methods - https://docs.microsoft.com/en-us/visualstudio/msbuild/msbuild-conditions?view=vs-2019#comparing-versions
---
src/Utilities/Compiler/Analyzer.Utilities.projitems | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Utilities/Compiler/Analyzer.Utilities.projitems b/src/Utilities/Compiler/Analyzer.Utilities.projitems
index 282295cb0..48848ea0f 100644
--- a/src/Utilities/Compiler/Analyzer.Utilities.projitems
+++ b/src/Utilities/Compiler/Analyzer.Utilities.projitems
@@ -8,13 +8,13 @@
<PropertyGroup Label="Configuration">
<Import_RootNamespace>Analyzer.Utilities</Import_RootNamespace>
</PropertyGroup>
- <PropertyGroup Condition="'$(MicrosoftCodeAnalysisVersion)' == '' OR '$(MicrosoftCodeAnalysisVersion)' &gt;= '3.3'">
+ <PropertyGroup Condition="'$(MicrosoftCodeAnalysisVersion)' == '' OR $([MSBuild]::VersionGreaterThanOrEquals($(MicrosoftCodeAnalysisVersion),'3.3'))">
<DefineConstants>$(DefineConstants),CODEANALYSIS_V3_OR_BETTER</DefineConstants>
</PropertyGroup>
- <PropertyGroup Condition="'$(MicrosoftCodeAnalysisVersion)' == '' OR '$(MicrosoftCodeAnalysisVersion)' &gt;= '3.7'">
+ <PropertyGroup Condition="'$(MicrosoftCodeAnalysisVersion)' == '' OR $([MSBuild]::VersionGreaterThanOrEquals($(MicrosoftCodeAnalysisVersion),'3.7'))">
<DefineConstants>$(DefineConstants),CODEANALYSIS_V3_7_OR_BETTER</DefineConstants>
</PropertyGroup>
- <PropertyGroup Condition="'$(MicrosoftCodeAnalysisVersion)' != '1.2.1'">
+ <PropertyGroup Condition="$([MSBuild]::VersionNotEquals($(MicrosoftCodeAnalysisVersion),'1.2.1'))">
<DefineConstants>$(DefineConstants);HAS_IOPERATION</DefineConstants>
<HasIOperation>true</HasIOperation>
<!-- Explicitly enable nullable for all projects that link Analyzer.Utilities.
--
2.29.2

63
src/SourceBuild/tarball/content/patches/roslyn-analyzers/0002-Update-versions.props-source-build-behavior.patch
View file

@ -1,63 +0,0 @@
From c989fd8d4e2ab9dc6d0a94bdaf43a2f5ec0a9d45 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 11 Aug 2021 22:12:31 +0000
Subject: [PATCH] Update versions.props source build behavior
These changes allow the repo to more easily control which dependency versions are used during source-build.
Normally the source build infrastructure imports its versions.props file containing all the source built versions after
the repo's versions.props file is imported.
---
eng/Versions.props | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index b0c147944..c41b54826 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,4 +1,20 @@
<Project>
+ <Import Project="$(SourceBuildPackageVersionPropsPath)" Condition="'$(SourceBuildPackageVersionPropsPath)' != ''"/>
+
+ <PropertyGroup>
+ <!--
+ Binaries that need to be executable during source build are restricted to versions available within source build.
+ This section defines executable versions of packages which are referenced via lower-version reference assemblies
+ during the build.
+ -->
+ <SystemCollectionsImmutableExecutableVersion>$(SystemCollectionsImmutableVersion)</SystemCollectionsImmutableExecutableVersion>
+ <SystemCollectionsImmutableExecutableVersion Condition="'$(SystemCollectionsImmutableExecutableVersion)' == ''">5.0.0</SystemCollectionsImmutableExecutableVersion>
+ <SystemReflectionMetadataExecutableVersion>$(SystemReflectionMetadataVersion)</SystemReflectionMetadataExecutableVersion>
+ <SystemReflectionMetadataExecutableVersion Condition="'$(SystemReflectionMetadataExecutableVersion)' == ''">5.0.0</SystemReflectionMetadataExecutableVersion>
+ <MicrosoftCodeAnalysisExecutableVersion>$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisExecutableVersion>
+ <MicrosoftCodeAnalysisExecutableVersion Condition="'$(MicrosoftCodeAnalysisExecutableVersion)' == ''">3.8.0</MicrosoftCodeAnalysisExecutableVersion>
+ </PropertyGroup>
+
<PropertyGroup>
<VersionPrefix>3.3.3</VersionPrefix>
<PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
@@ -53,22 +69,10 @@
<NewtonsoftJsonVersion>12.0.1</NewtonsoftJsonVersion>
<PerfolizerVersion>0.2.1</PerfolizerVersion>
<SQLitePCLRawVersion>1.1.2</SQLitePCLRawVersion>
- <SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
<SystemCommandLineRenderingVersion>2.0.0-beta1.20074.1</SystemCommandLineRenderingVersion>
<SystemCommandLineVersion>2.0.0-beta1.21216.1</SystemCommandLineVersion>
<SystemComponentModelCompositionVersion>4.7.0</SystemComponentModelCompositionVersion>
<SystemDirectoryServicesVersion>4.7.0</SystemDirectoryServicesVersion>
- <SystemReflectionMetadataVersion>1.4.2</SystemReflectionMetadataVersion>
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
</PropertyGroup>
- <PropertyGroup>
- <!--
- Binaries that need to be executable during source build are restricted to versions available within source build.
- This section defines executable versions of packages which are referenced via lower-version reference assemblies
- during the build.
- -->
- <SystemCollectionsImmutableExecutableVersion>5.0.0</SystemCollectionsImmutableExecutableVersion>
- <SystemReflectionMetadataExecutableVersion>5.0.0</SystemReflectionMetadataExecutableVersion>
- <MicrosoftCodeAnalysisExecutableVersion>3.8.0</MicrosoftCodeAnalysisExecutableVersion>
- </PropertyGroup>
</Project>
--
2.29.2

85
src/SourceBuild/tarball/content/patches/roslyn-analyzers/0003-Add-offline-validation-to-GenerateDocumentationAndCo.patch
View file

@ -1,85 +0,0 @@
From ea7eaff7d3385901d0d54b347f5762639cf80cd0 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 19 Aug 2021 15:29:03 +0000
Subject: [PATCH] Add offline validation to GenerateDocumentationAndConfigFiles
for source build
---
eng/GenerateAnalyzerNuspec.targets | 6 ++++--
.../GenerateDocumentationAndConfigFiles/Program.cs | 14 ++++++++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/eng/GenerateAnalyzerNuspec.targets b/eng/GenerateAnalyzerNuspec.targets
index a79e9d33f..9d86ab871 100644
--- a/eng/GenerateAnalyzerNuspec.targets
+++ b/eng/GenerateAnalyzerNuspec.targets
@@ -36,6 +36,8 @@
<_GeneratedRulesetsDir>$(IntermediateOutputPath)Rulesets</_GeneratedRulesetsDir>
<_GeneratedEditorconfigsDir>$(IntermediateOutputPath)Editorconfig</_GeneratedEditorconfigsDir>
<_GeneratedGlobalAnalyzerConfigsDir>$(IntermediateOutputPath)GlobalAnalyzerConfigs</_GeneratedGlobalAnalyzerConfigsDir>
+ <_ValidateOffline Condition="'$(DotNetBuildFromSource)' == 'true'">true</_ValidateOffline>
+ <_ValidateOffline Condition="'$(_ValidateOffline)' == ''">false</_ValidateOffline>
<ContainsPortedFxCopRules Condition="'$(ContainsPortedFxCopRules)' == ''">false</ContainsPortedFxCopRules>
<GeneratePackagePropsFile Condition="'$(GeneratePackagePropsFile)' == ''">true</GeneratePackagePropsFile>
<GenerateDisableNETAnalyzersPackagePropsFile Condition=" '$(GenerateDisableNETAnalyzersPackagePropsFile)' == '' and '$(ContainsPortedFxCopRules)' == 'true'">true</GenerateDisableNETAnalyzersPackagePropsFile>
@@ -106,9 +108,9 @@
<!-- Only run validate only in CI builds. Running them in local builds will prevent refreshing auto-generated files. -->
<Exec Condition="'$(ContinuousIntegrationBuild)' == 'true'"
- Command='"$(DotNetExecutable)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:true" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) "$(ReleaseTrackingOptOut)"' />
+ Command='"$(DotNetExecutable)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:true" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) "$(ReleaseTrackingOptOut)" $(_ValidateOffline)' />
- <Exec Command='"$(DotNetExecutable)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:false" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) "$(ReleaseTrackingOptOut)"' />
+ <Exec Command='"$(DotNetExecutable)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:false" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) "$(ReleaseTrackingOptOut)" $(_ValidateOffline)' />
<ItemGroup Condition="Exists('$(PackageTargetsFileDir)\$(PackageTargetsFileName)')">
<AnalyzerNupkgFile Include="$(PackageTargetsFileDir)\$(PackageTargetsFileName)"/>
diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
index a4c081184..af02b8ee2 100644
--- a/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/Program.cs
@@ -30,7 +30,7 @@ public static class Program
public static async Task<int> Main(string[] args)
{
- const int expectedArguments = 22;
+ const int expectedArguments = 23;
const string validateOnlyPrefix = "-validateOnly:";
if (args.Length != expectedArguments)
@@ -86,6 +86,11 @@ public static async Task<int> Main(string[] args)
releaseTrackingOptOut = false;
}
+ if (!bool.TryParse(args[22], out var validateOffline))
+ {
+ validateOffline = false;
+ }
+
var allRulesById = new SortedList<string, DiagnosticDescriptor>();
var fixableDiagnosticIds = new HashSet<string>();
var categories = new HashSet<string>();
@@ -624,7 +629,7 @@ await checkHelpLinkAsync(helpLinkUri).ConfigureAwait(false))
}
return;
- static async Task<bool> checkHelpLinkAsync(string helpLink)
+ async Task<bool> checkHelpLinkAsync(string helpLink)
{
try
{
@@ -633,6 +638,11 @@ static async Task<bool> checkHelpLinkAsync(string helpLink)
return false;
}
+ if (validateOffline)
+ {
+ return true;
+ }
+
var request = new HttpRequestMessage(HttpMethod.Head, uri);
using var response = await httpClient.SendAsync(request).ConfigureAwait(false);
return response?.StatusCode == HttpStatusCode.OK;
--
2.29.2

27
src/SourceBuild/tarball/content/patches/runtime/0001-Conditionally-build-allconfigurations.patch
View file

@ -1,27 +0,0 @@
From c1eaa569a1ebe3aa688ca251fcbcb42ee086cf27 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 18 Aug 2021 12:20:24 +0000
Subject: [PATCH] Conditionally build allconfigurations
When building portable, only a subset of runtime needs to be
built. allconfigurations is only needed in a non-portable build.
---
eng/SourceBuild.props | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 7dfc80d41fd..1e3bd504931 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -37,7 +37,7 @@
<InnerBuildArgs>$(InnerBuildArgs) --arch $(TargetRidPlatform)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --configuration $(Configuration)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --ci</InnerBuildArgs>
- <InnerBuildArgs>$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
+ <InnerBuildArgs Condition="'$(SourceBuildNonPortable)' == 'true'">$(InnerBuildArgs) --allconfigurations</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --verbosity $(LogVerbosity)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
--
2.31.1

25
src/SourceBuild/tarball/content/patches/runtime/0001-Exclude-ILStrip-from-source-build.patch Normal file
View file

@ -0,0 +1,25 @@
From b8e5f85d42b61d29701ace6907e3f320f868bae7 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 15:22:00 +0000
Subject: [PATCH] Exclude ILStrip from source-build
Underlying issue is tracked by https://github.com/dotnet/source-build/issues/2438. ExcludeFromSourceBuild as a temporary solution as the project is not currently required.
---
src/tasks/ILStripTask/ILStrip.csproj | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/tasks/ILStripTask/ILStrip.csproj b/src/tasks/ILStripTask/ILStrip.csproj
index 879c56f26ae..0ad46c08191 100644
--- a/src/tasks/ILStripTask/ILStrip.csproj
+++ b/src/tasks/ILStripTask/ILStrip.csproj
@@ -4,6 +4,7 @@
<OutputType>Library</OutputType>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<NoWarn>$(NoWarn),CA1050,CS0618,CS0649,CS8604,CS8602,CS8632,SYSLIB0003</NoWarn>
<RunAnalyzers>false</RunAnalyzers>
</PropertyGroup>
--
2.29.2

27
src/SourceBuild/tarball/content/patches/runtime/0002-Disable-WasmAppBuilder-PublishBuilder-for-source-bui.patch Normal file
View file

@ -0,0 +1,27 @@
From 3638f46d82289dee4d87b82190e3ef67105b4c56 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 16:15:49 +0000
Subject: [PATCH] Disable WasmAppBuilder PublishBuilder for source-build
Temporary until https://github.com/dotnet/runtime/issues/58816 is resolved.
---
src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
index 3c93ab5d643..9e325bfcbf4 100644
--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
+++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
@@ -24,7 +24,8 @@
</ItemGroup>
<Target Name="PublishBuilder"
- AfterTargets="Build">
+ AfterTargets="Build"
+ Condition="'$(DotNetBuildFromSource)' != 'true'">
<!-- needed for publishing with multi-targeting. We are publishing essentially to get the SR.MetadataLoadContext.dll :/ -->
<ItemGroup>
--
2.29.2

40
src/SourceBuild/tarball/content/patches/runtime/0002-msquic-source-build-patches.patch Normal file
View file

@ -0,0 +1,40 @@
From d3e43d32095172d29f101fe20694822399c3ad1b Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 19:22:01 +0000
Subject: [PATCH] msquic source-build patches
Backport of changes to support msquic in source-build - https://github.com/dotnet/runtime/pull/58651
---
.../pkg/sfx/Microsoft.NETCore.App/Directory.Build.props | 2 +-
src/libraries/System.Net.Quic/src/System.Net.Quic.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
index 19c48f2ec85..63f5649ec6a 100644
--- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
+++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props
@@ -161,7 +161,7 @@
<PlatformManifestFileEntry Include="api-ms-win-crt-utility-l1-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
<PlatformManifestFileEntry Include="API-MS-Win-core-xstate-l2-1-0.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)" />
<PlatformManifestFileEntry Include="ucrtbase.dll" IsNative="true" />
- <PlatformManifestFileEntry Include="msquic.dll" IsNative="true" />
+ <PlatformManifestFileEntry Include="msquic.dll" IsNative="true" FallbackFileVersion="$(WindowsForwarderFileVersion)"/>
<PlatformManifestFileEntry Include="System.IO.Compression.Native.dll" IsNative="true" />
<PlatformManifestFileEntry Include="createdump.exe" IsNative="true" />
<PlatformManifestFileEntry Include="createdump" IsNative="true" />
diff --git a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
index 4549842ee8e..3fc0bb3a6c1 100644
--- a/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
+++ b/src/libraries/System.Net.Quic/src/System.Net.Quic.csproj
@@ -127,7 +127,7 @@
</ItemGroup>
<!-- Support for deploying msquic -->
- <ItemGroup Condition="'$(TargetsWindows)' == 'true' and
+ <ItemGroup Condition="'$(_hostOS)' == 'windows' and
('$(TargetArchitecture)' == 'x64' or '$(TargetArchitecture)' == 'x86')">
<BinPlaceDir Include="$(MicrosoftNetCoreAppRuntimePackNativeDir)" ItemName="NativeBinPlaceItem" />
<BinPlaceDir Include="$(NetCoreAppCurrentTestHostSharedFrameworkPath)" ItemName="NativeBinPlaceItem" />
--
2.29.2

39
src/SourceBuild/tarball/content/patches/sdk/0001-Change-Compatibility-projects-TargetFrameworks.patch Normal file
View file

@ -0,0 +1,39 @@
From b1e8b42bfe073813258e8143931199b5883e9123 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 22:00:23 +0000
Subject: [PATCH] Change Compatibility projects' TargetFrameworks
Addresses the following errors:
error NU1202: Package NuGet.Packaging 6.0.0-preview.4.32767 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package NuGet.Packaging 6.0.0-preview.4.32767 supports: net6.0
---
.../Microsoft.DotNet.Compatibility.csproj | 1 +
.../Microsoft.DotNet.PackageValidation.csproj | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
index f9f8e4632..92624be84 100644
--- a/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
+++ b/src/Compatibility/Microsoft.DotNet.Compatibility/Microsoft.DotNet.Compatibility.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsShippingPackage>true</IsShippingPackage>
<StrongNameKeyId>Open</StrongNameKeyId>
diff --git a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
index 4241f4577..7a8b64865 100644
--- a/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
+++ b/src/Compatibility/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>net6.0;net472</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>
--
2.29.2

41
src/SourceBuild/tarball/content/patches/sdk/0001-Update-reference-versions-to-be-source-buildable.patch
View file

@ -1,41 +0,0 @@
From c57808231260cc3467b98d97c3249a59db9757f2 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 9 Aug 2021 13:43:41 +0000
Subject: [PATCH] Update reference versions to be source buildable
Update CodeAnalysis version reference to utilize Versions.props in order to work with source build.
---
eng/Versions.props | 1 +
.../Microsoft.NET.Sdk.Razor.SourceGenerators.csproj | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/eng/Versions.props b/eng/Versions.props
index 07cca8a35..8fb6dffaf 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -122,6 +122,7 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-2.21359.14</MicrosoftNetCompilersToolsetPackageVersion>
+ <MicrosoftCodeAnalysisPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-2.21359.14</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
diff --git a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
index 1213ec4db..81697986c 100644
--- a/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
+++ b/src/RazorSdk/SourceGenerators/Microsoft.NET.Sdk.Razor.SourceGenerators.csproj
@@ -15,8 +15,8 @@
<!-- Instead of using the version of M.C.C defined in Version.props we pin to a minimum required
version to avoid issues with loading newer versions of the assembly in VS/VS Code. -->
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCoreRazorLanguageVersion)" GeneratePathProperty="true" />
- <PackageReference Include="Microsoft.CodeAnalysis" Version="4.0.0-2.21354.7" />
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-2.21354.7" />
+ <PackageReference Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="$(MicrosoftCodeAnalysisRazorVersion)" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="$(MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion)" GeneratePathProperty="true" />
</ItemGroup>
--
2.29.2

53
src/SourceBuild/tarball/content/patches/sdk/0003-Remove-472-TFM-from-source-build.patch
View file

@ -1,53 +0,0 @@
From 6009d921575a4474c66b812bdb914237ddb04cc2 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 9 Aug 2021 15:27:19 +0000
Subject: [PATCH] Remove 472 TFM from source build
src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0)
src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj : error NU1202: Package Microsoft.Build 17.0.0 is not compatible with net472 (.NETFramework,Version=v4.7.2). Package Microsoft.Build 17.0.0 supports: net6.0 (.NETCoreApp,Version=v6.0)
.dotnet/sdk/6.0.100-preview.5.21225.11/Microsoft.Common.CurrentVersion.targets(1717,5): error : Project '../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj' targets 'net6.0'. It cannot be referenced by a project that targets '.NETFramework,Version=v4.7.2'.
---
.../Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj | 1 +
.../Microsoft.NET.Build.Extensions.Tasks.csproj | 1 +
.../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 +
3 files changed, 3 insertions(+)
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index c10a6224c..66a26913b 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
<SignAssembly>true</SignAssembly>
diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
index 280fbdc83..13ada8222 100644
--- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj
@@ -16,6 +16,7 @@
<OutputType>Library</OutputType>
<RootNamespace>Microsoft.NET.Build.Tasks</RootNamespace>
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index e7ff48146..c98ed27cf 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -13,6 +13,7 @@
<Description>The MSBuild targets and properties for building .NET Core projects.</Description>
<OutputType>Library</OutputType>
<TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(SdkTargetFramework)</TargetFrameworks>
<Nullable>annotations</Nullable>
</PropertyGroup>
--
2.29.2

31
src/SourceBuild/tarball/content/patches/sdk/0004-Add-toolset-zip-as-source-build-intermediate.patch
View file

@ -1,31 +0,0 @@
From 3c008b2c3f04f2d0bd04ae0c1f7d56a64141842c Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Mon, 16 Aug 2021 16:33:33 +0000
Subject: [PATCH] Add toolset zip as source build intermediate
---
eng/SourceBuild.props | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 8bc7785fb..539a1490a 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -11,4 +11,14 @@
</PropertyGroup>
</Target>
+ <Target Name="GetSdkCategorizedIntermediateNupkgContents"
+ BeforeTargets="GetCategorizedIntermediateNupkgContents">
+ <ItemGroup>
+ <!--
+ Add the internal toolset zip required by dotnet/installer.
+ -->
+ <IntermediateNupkgArtifactFile Include="$(CurrentRepoSourceBuildArtifactsPackagesDir)NonShipping\dotnet-toolset-internal-*.zip" />
+ </ItemGroup>
+ </Target>
+
</Project>
--
2.29.2

42
src/SourceBuild/tarball/content/patches/sdk/0004-Disable-CA1416-for-ProcessExtensions.patch
View file

@ -1,42 +0,0 @@
From 3e0c6887921670b5d9e312b121791307516a4ce2 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 18 Aug 2021 11:41:59 +0000
Subject: [PATCH] Disable CA1416 for ProcessExtensions
Since source-build loads an updated version of code analysis, this
warning is showing up here. Disable warning, since code is meant
to be windows only.
Eliminates errors like:
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,20): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.MoveNext()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(35,55): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher.Get()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(36,80): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.GetEnumerator()' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementObjectCollection.ManagementObjectEnumerator.Current' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(34,49): error CA1416: This call site is reachable on all platforms. 'ManagementObjectSearcher' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs(38,60): error CA1416: This call site is reachable on all platforms. 'ManagementBaseObject.GetPropertyValue(string)' is only supported on: 'windows'. [/src/tb-installer/src/sdk.5fab7585de482237f470634489b969a1bd03e063/artifacts/source-build/self/src/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj]
---
.../Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
index a9e9880c7..82519dc63 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs
@@ -12,6 +12,7 @@ namespace Microsoft.DotNet.Cli.Utils
/// </summary>
public static class ProcessExtensions
{
+#pragma warning disable CA1416
/// <summary>
/// Returns the parent process of this process by querying the Win32_Process class.
/// </summary>
@@ -37,5 +38,6 @@ public static int GetParentProcessId(this Process process)
return enumerator.MoveNext() ? Convert.ToInt32(enumerator.Current.GetPropertyValue("ParentProcessId")) : -1;
}
+#pragma warning restore CA1416
}
}
--
2.31.1

94
src/SourceBuild/tarball/content/patches/sourcelink/0001-Update-TFMs-to-net6.0.patch
View file

@ -32,121 +32,121 @@ index 4ea51a8..eff58cf 100644
<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 71b45db..9f25e24 100644
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
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 b905b8e..43cd185 100644
index ceec252..84e89bd 100644
--- a/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
+++ b/src/SourceLink.AzureDevOpsServer.Git/Microsoft.SourceLink.AzureDevOpsServer.Git.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 8a5a0bf..5400288 100644
index bdb048e..b01b429 100644
--- a/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
+++ b/src/SourceLink.AzureRepos.Git/Microsoft.SourceLink.AzureRepos.Git.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 387b65c..db2ce6c 100644
index bf27b3f..11ac33d 100644
--- a/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
+++ b/src/SourceLink.Bitbucket.Git/Microsoft.SourceLink.Bitbucket.Git.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 b220563..5cf5ab4 100644
index 09ac8ec..534b316 100644
--- a/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
+++ b/src/SourceLink.Common/Microsoft.SourceLink.Common.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 45985c8..1b9edbc 100644
index 626b9cc..0c025ca 100644
--- a/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
+++ b/src/SourceLink.GitHub/Microsoft.SourceLink.GitHub.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 18300ce..9ca4657 100644
index 4a1d0af..ada8986 100644
--- a/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
+++ b/src/SourceLink.GitLab/Microsoft.SourceLink.GitLab.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 1991db7..ae16d1f 100644
index 19f92a8..b9ec7b4 100644
--- a/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
+++ b/src/SourceLink.GitWeb/Microsoft.SourceLink.GitWeb.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 b5bbc93..164e243 100644
index fa9e33e..acca3af 100644
--- a/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
+++ b/src/SourceLink.Gitea/Microsoft.SourceLink.Gitea.csproj
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
@@ -3,6 +3,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net5.0</TargetFrameworks>
<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 053f124..f27f774 100644
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>net5.0;net472</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<DebugType>none</DebugType>

142
src/SourceBuild/tarball/content/patches/sourcelink/0002-Update-Task-paths-to-include-net6.0.patch
View file

@ -1,142 +0,0 @@
From e41e61e4c91785ba5ff1761c7d14d9f92a612ae4 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 22 Jul 2021 15:00:30 +0000
Subject: [PATCH] Update Task paths to include net6.0
When building from source, only the current TFM is built. Update
tool paths to look in net6.0 path when building from source.
---
.../build/Microsoft.Build.Tasks.Git.props | 1 +
.../build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets | 1 +
.../build/Microsoft.SourceLink.AzureRepos.Git.targets | 1 +
.../build/Microsoft.SourceLink.AzureRepos.Tfvc.targets | 1 +
.../build/Microsoft.SourceLink.Bitbucket.Git.targets | 1 +
src/SourceLink.Common/build/Microsoft.SourceLink.Common.props | 1 +
src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets | 1 +
src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets | 1 +
src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets | 1 +
src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets | 1 +
10 files changed, 10 insertions(+)
diff --git a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props
index 337242e..25f1d1d 100644
--- a/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props
+++ b/src/Microsoft.Build.Tasks.Git/build/Microsoft.Build.Tasks.Git.props
@@ -3,5 +3,6 @@
<PropertyGroup>
<MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
<MicrosoftBuildTasksGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
+ <MicrosoftBuildTasksGitAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.Build.Tasks.Git.dll</MicrosoftBuildTasksGitAssemblyFile>
</PropertyGroup>
</Project>
diff --git a/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets b/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets
index 1c2b313..fcb1ed8 100644
--- a/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets
+++ b/src/SourceLink.AzureDevOpsServer.Git/build/Microsoft.SourceLink.AzureDevOpsServer.Git.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
<_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
+ <_SourceLinkAzureDevOpsServerGitAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureDevOpsServer.Git.dll</_SourceLinkAzureDevOpsServerGitAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.AzureDevOpsServer.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureDevOpsServerGitAssemblyFile)"/>
diff --git a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets
index d49e459..74a504c 100644
--- a/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets
+++ b/src/SourceLink.AzureRepos.Git/build/Microsoft.SourceLink.AzureRepos.Git.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
<_SourceLinkAzureReposGitAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
+ <_SourceLinkAzureReposGitAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureRepos.Git.dll</_SourceLinkAzureReposGitAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.AzureRepos.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureReposGitAssemblyFile)"/>
diff --git a/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets b/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets
index f4045fb..2f3fc2d 100644
--- a/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets
+++ b/src/SourceLink.AzureRepos.Tfvc/build/Microsoft.SourceLink.AzureRepos.Tfvc.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
<_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
+ <_SourceLinkAzureReposTfvcAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.AzureRepos.Tfvc.dll</_SourceLinkAzureReposTfvcAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.AzureRepos.Tfvc.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkAzureReposTfvcAssemblyFile)"/>
diff --git a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets
index 0cb1491..76eb4b5 100644
--- a/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets
+++ b/src/SourceLink.Bitbucket.Git/build/Microsoft.SourceLink.Bitbucket.Git.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
<_SourceLinkBitbucketAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
+ <_SourceLinkBitbucketAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.Bitbucket.Git.dll</_SourceLinkBitbucketAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.Bitbucket.Git.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkBitbucketAssemblyFile)"/>
diff --git a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props
index ac63a8a..ab657ff 100644
--- a/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props
+++ b/src/SourceLink.Common/build/Microsoft.SourceLink.Common.props
@@ -3,6 +3,7 @@
<PropertyGroup>
<_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Common.dll</_MicrosoftSourceLinkCommonAssemblyFile>
<_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.Common.dll</_MicrosoftSourceLinkCommonAssemblyFile>
+ <_MicrosoftSourceLinkCommonAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.Common.dll</_MicrosoftSourceLinkCommonAssemblyFile>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets
index 2641835..52df43f 100644
--- a/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets
+++ b/src/SourceLink.GitHub/build/Microsoft.SourceLink.GitHub.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitHub.dll</_SourceLinkGitHubAssemblyFile>
<_SourceLinkGitHubAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.GitHub.dll</_SourceLinkGitHubAssemblyFile>
+ <_SourceLinkGitHubAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.GitHub.dll</_SourceLinkGitHubAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.GitHub.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkGitHubAssemblyFile)"/>
diff --git a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets
index ffc5140..72dae7e 100644
--- a/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets
+++ b/src/SourceLink.GitLab/build/Microsoft.SourceLink.GitLab.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitLab.dll</_SourceLinkGitLabAssemblyFile>
<_SourceLinkGitLabAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.GitLab.dll</_SourceLinkGitLabAssemblyFile>
+ <_SourceLinkGitLabAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.GitLab.dll</_SourceLinkGitLabAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.GitLab.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkGitLabAssemblyFile)"/>
diff --git a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets
index 9f21d62..8f5c453 100644
--- a/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets
+++ b/src/SourceLink.GitWeb/build/Microsoft.SourceLink.GitWeb.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.GitWeb.dll</_SourceLinkGitWebAssemblyFile>
<_SourceLinkGitWebAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.GitWeb.dll</_SourceLinkGitWebAssemblyFile>
+ <_SourceLinkGitWebAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.GitWeb.dll</_SourceLinkGitWebAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.GitWeb.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkGitWebAssemblyFile)" />
diff --git a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets
index 5b6765e..8cccda0 100644
--- a/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets
+++ b/src/SourceLink.Gitea/build/Microsoft.SourceLink.Gitea.targets
@@ -3,6 +3,7 @@
<PropertyGroup>
<_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.SourceLink.Gitea.dll</_SourceLinkGiteaAssemblyFile>
<_SourceLinkGiteaAssemblyFile Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net5.0\Microsoft.SourceLink.Gitea.dll</_SourceLinkGiteaAssemblyFile>
+ <_SourceLinkGiteaAssemblyFile Condition="'$(DotNetBuildFromSource)' == 'true'">$(MSBuildThisFileDirectory)..\tools\net6.0\Microsoft.SourceLink.Gitea.dll</_SourceLinkGiteaAssemblyFile>
</PropertyGroup>
<UsingTask TaskName="Microsoft.SourceLink.Gitea.GetSourceLinkUrl" AssemblyFile="$(_SourceLinkGiteaAssemblyFile)"/>
--
2.31.1

36
src/SourceBuild/tarball/content/patches/sourcelink/0003-Allow-using-.git-directory-instead-of-gitdir-redirec.patch
View file

@ -1,36 +0,0 @@
From cfb26098630fe3cd9648ebcbbe9ac59278b63242 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Thu, 5 Aug 2021 19:51:19 +0000
Subject: [PATCH] Allow using .git directory instead of gitdir redirect in
submodules
---
.../GitDataReader/GitRepository.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs b/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs
index 9f1648f..c079197 100644
--- a/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs
+++ b/src/Microsoft.Build.Tasks.Git/GitDataReader/GitRepository.cs
@@ -209,6 +209,18 @@ public static GitRepository OpenRepository(GitRepositoryLocation location, GitEn
/// <returns>Null if the HEAD tip reference can't be resolved.</returns>
internal string? ReadSubmoduleHeadCommitSha(string submoduleWorkingDirectoryFullPath)
{
+ // Submodules don't usually have their own .git directories but this is still legal.
+ // This can occur with older versions of Git or other tools, or when a user clones one
+ // repo into another's source tree (but it was not yet registered as a submodule).
+ // See https://git-scm.com/docs/gitsubmodules#_forms for more details.
+ // Handle this case first since the other case throws.
+ var dotGitPath = Path.Combine(submoduleWorkingDirectoryFullPath, GitDirName);
+ if (IsGitDirectory(dotGitPath, out var directSubmoduleGitDirectory))
+ {
+ var submoduleGitDirResolver = new GitReferenceResolver(directSubmoduleGitDirectory, directSubmoduleGitDirectory);
+ return submoduleGitDirResolver.ResolveHeadReference();
+ }
+
var gitDirectory = ReadDotGitFile(Path.Combine(submoduleWorkingDirectoryFullPath, GitDirName));
if (!IsGitDirectory(gitDirectory, out var commonDirectory))
{
--
2.29.2

31
src/SourceBuild/tarball/content/patches/symreader/0001-Exlude-test-project-from-source-build.patch
View file

@ -1,31 +0,0 @@
From f4978575da2a47049a941260629f0f2e54979778 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Thu, 22 Jul 2021 13:33:45 +0000
Subject: [PATCH] Exlude test project from source-build
---
src/TestUtilities/TestUtilities.csproj | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/TestUtilities/TestUtilities.csproj b/src/TestUtilities/TestUtilities.csproj
index c83b5df..92279cc 100644
--- a/src/TestUtilities/TestUtilities.csproj
+++ b/src/TestUtilities/TestUtilities.csproj
@@ -3,6 +3,7 @@
<TargetFramework>netstandard1.3</TargetFramework>
<IsShipping>false</IsShipping>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
@@ -13,4 +14,4 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.DiaSymReader\Microsoft.DiaSymReader.csproj" />
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
--
2.31.1

99
src/SourceBuild/tarball/content/patches/templating/0001-fixed-TemplateLocalizer-tool.patch
View file

@ -1,99 +0,0 @@
From 3ac6d94eed6cfbb7c06128fe4caa91e9701bc2f9 Mon Sep 17 00:00:00 2001
From: Vlada Shubina <vshubina@microsoft.com>
Date: Wed, 7 Jul 2021 12:10:50 +0300
Subject: [PATCH] fixed TemplateLocalizer tool
See https://github.com/dotnet/templating/issues/3379 for additional details.
---
NuGet.config | 1 +
.../TemplateLocalizer.cs | 8 +++++++-
.../Commands/Export/ExportCommand.cs | 8 ++------
.../ExportCommandTests.cs | 5 +++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/NuGet.config b/NuGet.config
index b91f5fa3..30266b54 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,7 @@
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="nugetbuild" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/nuget-build/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+ <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
diff --git a/src/Microsoft.TemplateEngine.TemplateLocalizer.Core/TemplateLocalizer.cs b/src/Microsoft.TemplateEngine.TemplateLocalizer.Core/TemplateLocalizer.cs
index f99ab340..ca64813e 100644
--- a/src/Microsoft.TemplateEngine.TemplateLocalizer.Core/TemplateLocalizer.cs
+++ b/src/Microsoft.TemplateEngine.TemplateLocalizer.Core/TemplateLocalizer.cs
@@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
+using System.Linq;
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
@@ -48,11 +49,16 @@ public async Task<ExportResult> ExportLocalizationFilesAsync(string templateJson
IReadOnlyList<TemplateString> templateJsonStrings = stringExtractor.ExtractStrings(out string templateJsonLanguage);
string targetDirectory = options.TargetDirectory ?? Path.Combine(Path.GetDirectoryName(templateJsonPath) ?? string.Empty, "localize");
+ IEnumerable<string> languages = ExportOptions.DefaultLanguages;
+ if (options.Languages?.Any() ?? false)
+ {
+ languages = options.Languages;
+ }
await TemplateStringUpdater.UpdateStringsAsync(
templateJsonStrings,
templateJsonLanguage,
- options.Languages ?? ExportOptions.DefaultLanguages,
+ languages,
targetDirectory,
options.DryRun,
_logger,
diff --git a/src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs b/src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs
index 5466ddcb..e1d8df4b 100644
--- a/src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs
+++ b/src/Microsoft.TemplateEngine.TemplateLocalizer/Commands/Export/ExportCommand.cs
@@ -33,15 +33,11 @@ public override Command CreateCommand()
Name = "--recursive",
Description = LocalizableStrings.command_export_help_recursive_description,
});
- exportCommand.AddOption(new Option("-l")
+ exportCommand.AddOption(new Option<string>("-l")
{
Name = "--language",
Description = LocalizableStrings.command_export_help_language_description,
- Argument = new Argument()
- {
- Arity = ArgumentArity.OneOrMore,
- ArgumentType = typeof(string),
- },
+ Arity = ArgumentArity.OneOrMore
});
exportCommand.AddOption(new Option("-d")
{
diff --git a/test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs b/test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs
index 15682740..db81413c 100644
--- a/test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs
+++ b/test/Microsoft.TemplateEngine.TemplateLocalizer.IntegrationTests/ExportCommandTests.cs
@@ -153,11 +153,12 @@ public async Task LanguagesCanBeOverriden()
string[] exportedFiles = await RunTemplateLocalizer(
GetTestTemplateJsonContent(),
_workingDirectory,
- args: new string[] { "export", _workingDirectory, "--language", "tr" })
+ args: new string[] { "export", _workingDirectory, "--language", "tr", "de" })
.ConfigureAwait(false);
- Assert.Single(exportedFiles);
+ Assert.Equal(2, exportedFiles.Length);
Assert.True(File.Exists(Path.Combine(_workingDirectory, "localize", "templatestrings.tr.json")));
+ Assert.True(File.Exists(Path.Combine(_workingDirectory, "localize", "templatestrings.de.json")));
Assert.False(File.Exists(Path.Combine(_workingDirectory, "localize", "templatestrings.es.json")));
}
--
2.29.2

26
src/SourceBuild/tarball/content/patches/vstest/0001-Condition-win7-x86-RID.patch
View file

@ -1,26 +0,0 @@
From 0fc9ffcb249411f9911a6e13f939eaf95bf219c8 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Wed, 7 Jul 2021 20:57:34 +0000
Subject: [PATCH] Condition win7-x86 RID
Eliminate build errors from source-build building for linux RIDs
---
src/SettingsMigrator/SettingsMigrator.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj
index 4f9f6a30..528ed1a4 100644
--- a/src/SettingsMigrator/SettingsMigrator.csproj
+++ b/src/SettingsMigrator/SettingsMigrator.csproj
@@ -15,7 +15,7 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
- <PropertyGroup>
+ <PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
<RuntimeIdentifier>win7-x64</RuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
--
2.26.2

26
src/SourceBuild/tarball/content/patches/vstest/0001-Drop-vstest.console-netcoreapp2.1-support.patch Normal file
View file

@ -0,0 +1,26 @@
From 752ab8ab199bd1d99353658cb676a6612508333b Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Wed, 8 Sep 2021 21:31:01 +0000
Subject: [PATCH] Drop vstest.console netcoreapp2.1 support
Workaround for https://github.com/microsoft/vstest/issues/3044
---
src/vstest.console/vstest.console.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 1343e6d9..7c555591 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -8,7 +8,7 @@
<PropertyGroup>
<AssemblyName>vstest.console</AssemblyName>
<TargetFrameworks>netcoreapp2.1;net451</TargetFrameworks>
- <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netcoreapp2.1;net6.0</TargetFrameworks>
+ <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">net6.0</TargetFrameworks>
<WarningsAsErrors>true</WarningsAsErrors>
<OutputType>Exe</OutputType>
<IsTestProject>false</IsTestProject>
--
2.29.2

2
src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
View file

@ -5,6 +5,8 @@
<LogVerbosityOptOut>true</LogVerbosityOptOut>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity)</BuildCommandArgs>
<!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/CliCommandLineParser/issues/189 -->
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>

5
src/SourceBuild/tarball/content/repos/diagnostics.proj
View file

@ -2,7 +2,10 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<BuildCommand>$(ProjectDirectory)eng\common\build$(ShellExtension) $(StandardSourceBuildArgs)</BuildCommand>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/diagnostics/issues/1640 -->
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
<BuildCommand>$(ProjectDirectory)eng\common\build$(ShellExtension) $(BuildCommandArgs)</BuildCommand>
<GlobalJsonFile>$(ProjectDirectory)global.json</GlobalJsonFile>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>

4
src/SourceBuild/tarball/content/repos/linker.proj
View file

@ -5,7 +5,9 @@
<!-- Package version is pinned to what CoreFX expects because CoreFX doesn't take an override property. -->
<ILLinkTasksPackageId>Microsoft.NET.ILLink.Tasks</ILLinkTasksPackageId>
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<BuildCommandArgs>$(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg)</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<RepoApiImplemented>false</RepoApiImplemented>
<NuGetConfigFile>$(ProjectDirectory)NuGet.config</NuGetConfigFile>

5
src/SourceBuild/tarball/content/repos/xliff-tasks.proj
View file

@ -2,7 +2,10 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<PropertyGroup>
<BuildCommand>$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)</BuildCommand>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/xliff-tasks/issues/508 -->
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<RepoApiImplemented>false</RepoApiImplemented>
<DependencyVersionInputRepoApiImplemented>true</DependencyVersionInputRepoApiImplemented>