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

Merge branch 'main' of https://github.com/dotnet/installer into darc-main-158162d1-d711-4622-b087-ce4608ffb6de

Browse source
This commit is contained in:
MichaelSimons 2022-04-18 13:38:18 +00:00
commit 7e7e836a75
5 changed files with 38 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -197,23 +197,23 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22212.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22212.2">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22212.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22215.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2e24ed0bdbd4e3b42c296503955c837bb0b08372</Sha>
<Sha>4000024394df3049886c50e54ad0a2b903221ef0</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22164.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22215.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>5d865ff0971f712b52cf1dd7d3e98ff4c0ff5759</Sha>
<Sha>3147e7ae7ba3ba499d4a2d18c8a4d89bab6769d0</Sha>
<SourceBuildTarball RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22179-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
@ -221,9 +221,9 @@
<Sha>00accce73f32b91a59d3be28c1f6993c3cd4df3e</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22208.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22213.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>c52e008e5cfd83344739acb2f6d5ef4586f4b426</Sha>
<Sha>8af700a39b25c7c01185e7140795cb80dbb48cf1</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>

2
eng/Versions.props
View file

@ -26,7 +26,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22213.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22215.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22213.2",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22213.2"
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22215.2",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22215.2"
}
}

24
src/SourceBuild/tarball/patches/linker/0001-Condition-out-the-BannedApiAnalyzers-usage-in-source.patch Normal file
View file

@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MichaelSimons <msimons@microsoft.com>
Date: Wed, 13 Apr 2022 21:30:39 +0000
Subject: [PATCH] Condition out the BannedApiAnalyzers usage in source-build
Removes prebuilt.
Patch for https://github.com/dotnet/linker/pull/2742
---
src/linker/Mono.Linker.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linker/Mono.Linker.csproj b/src/linker/Mono.Linker.csproj
index 391300aa..d276003e 100644
--- a/src/linker/Mono.Linker.csproj
+++ b/src/linker/Mono.Linker.csproj
@@ -31,7 +31,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)">
+ <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>

4
test/SdkTests/SdkTests.csproj
View file

@ -176,9 +176,7 @@
<ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR=&amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
<ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
<ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath DOTNET_HOST_PATH DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet new tool-manifest"