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

Correcting source-build related merge issues

Browse source
This commit is contained in:
MichaelSimons 2021-10-01 17:20:53 +00:00
parent 62b386e76b
commit c2aa7e513e
3 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
eng/Version.Details.xml
View file

@ -20,6 +20,7 @@
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21479.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e013f14c5330375a18656dea8dca14e5602a3ae0</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rtm.21479.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -128,6 +129,7 @@
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-release-20210923-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>68bd10d3aee862a9fbb0bac8b3d474bc323024f3</Sha>
<SourceBuildTarball RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-1.21473.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/linker</Uri>
@ -148,6 +150,7 @@
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.258" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>e685bdb6d7b4d1f3664f6542f50b84376a19341c</Sha>
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
<Uri>https://github.com/Microsoft/ApplicationInsights-dotnet</Uri>

6
src/SourceBuild/tarball/patches/sdk/0001-Rename-DeploymentReleasesVersion-Versions.props-entr.patch
View file

@ -19,11 +19,11 @@ index 0a7442c7c4..741b654ec4 100644
@@ -36,7 +36,7 @@
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>5.0.2</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.2.21470.23</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rtm.21479.7</SystemReflectionMetadataLoadContextVersion>
- <DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
+ <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview1.1.21112.1</MicrosoftDeploymentDotNetReleasesVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta1.21417.2</SystemCommandLineVersion>
<SystemCommandLineVersion>2.0.0-beta1.21473.1</SystemCommandLineVersion>
</PropertyGroup>
diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj
index b27862fb9d..539e127a63 100644
@ -35,7 +35,7 @@ index b27862fb9d..539e127a63 100644
<PackageReference Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
- <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(DeploymentReleasesVersion)" />
+ <PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="$(SystemServiceProcessServiceControllerVersion)" />
</ItemGroup>
<ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj

25
src/SourceBuild/tarball/patches/vstest/0002-Exclude-externals-when-building-from-source.patch
View file

@ -1,25 +0,0 @@
From 9cf491ea8b913b0ec615778e5597584e675f4205 Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Mon, 13 Sep 2021 21:01:44 +0000
Subject: [PATCH] Exclude externals when building from source
---
src/package/external/external.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/package/external/external.csproj b/src/package/external/external.csproj
index 036f92ce..9b0e87ad 100644
--- a/src/package/external/external.csproj
+++ b/src/package/external/external.csproj
@@ -29,7 +29,7 @@
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
- <ItemGroup>
+ <ItemGroup Condition=" '$(DotNetBuildFromSource)' != 'true' ">
<!-- This csproj restore external tools required for build process -->
<PackageReference Include="NuGet.CommandLine" Version="5.8.1" PrivateAssets="All" />
<PackageReference Include="fmdev.xlftool" Version="0.1.3" PrivateAssets="All" />
--
2.31.1