Djam/dotnet6.0
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/dotnet6.0.git synced 2025-02-23 14:12:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

3.1.12 -> 3.1.18;replace rosa2019.1 platform with rosa2021.1 in patches, remove unnecessary patches

Browse source
This commit is contained in:
slava86 2021-09-01 02:32:08 +03:00
parent 2ed7ffce9b
commit 5a00348a01
10 changed files with 155 additions and 303 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,4 @@
sources: sources:
dotnet-v3.1.112-SDK.tar.gz: e4b887e6ae07247a64ce50689605c46f50a98da1 dotnet-v3.1.112-SDK.tar.gz: e4b887e6ae07247a64ce50689605c46f50a98da1
dotnet-v3.1.118-SDK-original.tar.gz: 2f4fac048fda5cf19f04947ef7b509271db2f3db
dotnet-v3.1.118-SDK.tar.gz: 1b3240e054b9d1872aa043216755fe29c34e748a

8
RID-ROSA.patch
View file

@ -1,12 +1,12 @@
--- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs 2021-02-27 18:56:00.070820761 +0300 --- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs 2021-08-31 16:02:07.573333299 +0300
+++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs 2021-02-27 19:00:56.342954236 +0300 +++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs 2021-08-31 16:07:21.936666632 +0300
@@ -49,6 +49,14 @@ @@ -49,6 +49,14 @@
{ {
version = version.Substring(0, version.Length - "-osx".Length); version = version.Substring(0, version.Length - "-osx".Length);
} }
+ if (version.Contains("-rosa.2019.1")) + if (version.Contains("-rosa.2021.1"))
+ { + {
+ version = version.Substring(0, version.IndexOf("-rosa.2019.1")); + version = version.Substring(0, version.IndexOf("-rosa.2021.1"));
+ } + }
+ if (version.Contains("-rosa.2019.05")) + if (version.Contains("-rosa.2019.05"))
+ { + {

6
RuntimeIdentifierGraph-Rosa.patch
View file

@ -3,17 +3,17 @@
@@ -1,5 +1,35 @@ @@ -1,5 +1,35 @@
{ {
"runtimes": { "runtimes": {
+ "rosa.2019.1": { + "rosa.2021.1": {
+ "#import": [ + "#import": [
+ "linux" + "linux"
+ ] + ]
+ }, + },
+ "rosa.2019.1-arm64": { + "rosa.2021.1-arm64": {
+ "#import": [ + "#import": [
+ "linux-arm64" + "linux-arm64"
+ ] + ]
+ }, + },
+ "rosa.2019.1-x64": { + "rosa.2021.1-x64": {
+ "#import": [ + "#import": [
+ "linux-x64" + "linux-x64"
+ ] + ]

0
check-debug-symbols.py Executable file → Normal file
View file

19
core-setup-gcc11.patch
View file

@ -1,19 +0,0 @@
diff --git a/src/corehost/cli/test/nativehost/host_context_test.cpp b/src/corehost/cli/test/nativehost/host_context_test.cpp
index e6dc9f6d8..d42c0e0f2 100644
--- a/src/corehost/cli/test/nativehost/host_context_test.cpp
+++ b/src/corehost/cli/test/nativehost/host_context_test.cpp
@@ -11,6 +11,7 @@
#include <corehost_context_contract.h>
#include "host_context_test.h"
#include <utils.h>
+#include <thread>
namespace
{
@@ -539,4 +540,4 @@ bool host_context_test::load_assembly_and_get_function_pointer(
hostfxr_exports hostfxr{ hostfxr_path };
return load_assembly_and_get_function_pointer(hostfxr, config_path, argc, argv, config_log_prefix, test_output);
-}
\ No newline at end of file
+}

11
core-setup-hardening-flags.patch
View file

@ -1,11 +0,0 @@
diff --git a/src/settings.cmake b/src/settings.cmake
--- a/src/settings.cmake
+++ b/src/settings.cmake
@@ -218,6 +218,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
add_compile_options(-fstack-protector-strong)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_compile_options(-fstack-protector)

11
coreclr-hardening-flags.patch
View file

@ -1,11 +0,0 @@
diff --git a/src/debug/createdump/CMakeLists.txt b/src/debug/createdump/CMakeLists.txt
--- a/src/debug/createdump/CMakeLists.txt
+++ b/src/debug/createdump/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(BEFORE ${VM_DIR})
add_definitions(-DPAL_STDCPP_COMPAT)
add_compile_options(-fPIE)
+add_link_options(-pie)
set(CREATEDUMP_SOURCES
createdump.cpp

260
corefx-Rosalinux-groups.patch
View file

@ -1,11 +1,13 @@
diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283-diff/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-02-27 22:01:04.000000000 +0300 index da73456..428d9c9 100644
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-03-19 16:24:33.429393286 +0300 --- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -133,6 +133,50 @@ +++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -177,6 +177,53 @@
"any", "any",
"base" "base"
], ],
+ "alpine.3.13": [ + "alpine.3.14": [
+ "alpine.3.14",
+ "alpine.3.13", + "alpine.3.13",
+ "alpine.3.12", + "alpine.3.12",
+ "alpine.3.11", + "alpine.3.11",
@ -21,7 +23,9 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "alpine.3.13-x64": [ + "alpine.3.14-x64": [
+ "alpine.3.14-x64",
+ "alpine.3.14",
+ "alpine.3.13-x64", + "alpine.3.13-x64",
+ "alpine.3.13", + "alpine.3.13",
+ "alpine.3.12-x64", + "alpine.3.12-x64",
@ -52,47 +56,35 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
"alpine.3.6": [ "alpine.3.6": [
"alpine.3.6", "alpine.3.6",
"alpine", "alpine",
@@ -647,6 +691,23 @@ @@ -625,6 +672,74 @@
"any", "any",
"base" "base"
], ],
+ "exherbo": [ + "debian.11": [
+ "exherbo", + "debian.11",
+ "debian",
+ "linux", + "linux",
+ "unix", + "unix",
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "exherbo-x64": [ + "debian.11-arm": [
+ "exherbo-x64", + "debian.11-arm",
+ "exherbo", + "debian.11",
+ "linux-x64", + "debian-arm",
+ "debian",
+ "linux-arm",
+ "linux", + "linux",
+ "unix-x64", + "unix-arm",
+ "unix", + "unix",
+ "any", + "any",
+ "base" + "base"
+ ], + ],
"fedora": [ + "debian.11-arm64": [
"fedora", + "debian.11-arm64",
"linux", + "debian.11",
@@ -1058,6 +1119,38 @@ + "debian-arm64",
"any", + "debian",
"base"
],
+ "fedora.35": [
+ "fedora.35",
+ "fedora",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "fedora.35-arm64": [
+ "fedora.35-arm64",
+ "fedora.35",
+ "fedora-arm64",
+ "fedora",
+ "linux-arm64", + "linux-arm64",
+ "linux", + "linux",
+ "unix-arm64", + "unix-arm64",
@ -100,11 +92,23 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "fedora.35-x64": [ + "debian.11-armel": [
+ "fedora.35-x64", + "debian.11-armel",
+ "fedora.35", + "debian.11",
+ "fedora-x64", + "debian-armel",
+ "fedora", + "debian",
+ "linux-armel",
+ "linux",
+ "unix-armel",
+ "unix",
+ "any",
+ "base"
+ ],
+ "debian.11-x64": [
+ "debian.11-x64",
+ "debian.11",
+ "debian-x64",
+ "debian",
+ "linux-x64", + "linux-x64",
+ "linux", + "linux",
+ "unix-x64", + "unix-x64",
@ -112,17 +116,25 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "any", + "any",
+ "base" + "base"
+ ], + ],
"freebsd": [ + "debian.11-x86": [
"freebsd", + "debian.11-x86",
"unix", + "debian.11",
@@ -3037,6 +3130,97 @@ + "debian-x86",
"linux-x64", + "debian",
"linux", + "linux-x86",
"unix-x64", + "linux",
+ "unix-x86",
+ "unix", + "unix",
+ "any", + "any",
+ "base" + "base"
+ ], + ],
"debian.8": [
"debian.8",
"debian",
@@ -3204,6 +3319,97 @@
"any",
"base"
],
+ "rosa": [ + "rosa": [
+ "rosa", + "rosa",
+ "linux", + "linux",
@ -182,17 +194,17 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "rosa.2019.1": [ + "rosa.2021.1": [
+ "rosa.2019.1", + "rosa.2021.1",
+ "rosa", + "rosa",
+ "linux", + "linux",
+ "unix", + "unix",
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "rosa.2019.1-arm64": [ + "rosa.2021.1-arm64": [
+ "rosa.2019.1-arm64", + "rosa.2021.1-arm64",
+ "rosa.2019.1", + "rosa.2021.1",
+ "rosa-arm64", + "rosa-arm64",
+ "rosa", + "rosa",
+ "linux-arm64", + "linux-arm64",
@ -202,81 +214,86 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "any", + "any",
+ "base" + "base"
+ ], + ],
+ "rosa.2019.1-x64": [ + "rosa.2021.1-x64": [
+ "rosa.2019.1-x64", + "rosa.2021.1-x64",
+ "rosa.2019.1", + "rosa.2021.1",
+ "rosa-x64", + "rosa-x64",
+ "rosa", + "rosa",
+ "linux-x64", + "linux-x64",
+ "linux", + "linux",
+ "unix-x64", + "unix-x64",
"unix", + "unix",
"any", + "any",
"base" + "base"
diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.Platforms/runtime.json corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283-diff/pkg/Microsoft.NETCore.Platforms/runtime.json + ],
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-02-27 22:01:04.000000000 +0300 "sles": [
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-03-19 16:24:33.419381753 +0300 "sles",
@@ -44,6 +44,17 @@ "linux",
"alpine.3.11-x64" diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 608a034..f832924 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -55,6 +55,17 @@
"alpine.3.12-x64"
] ]
}, },
+ "alpine.3.13": { + "alpine.3.14": {
+ "#import": [ + "#import": [
+ "alpine.3.12" + "alpine.3.13"
+ ] + ]
+ }, + },
+ "alpine.3.13-x64": { + "alpine.3.14-x64": {
+ "#import": [ + "#import": [
+ "alpine.3.13", + "alpine.3.14",
+ "alpine.3.12-x64" + "alpine.3.13-x64"
+ ] + ]
+ }, + },
"alpine.3.6": { "alpine.3.6": {
"#import": [ "#import": [
"alpine" "alpine"
@@ -312,6 +323,17 @@ @@ -286,6 +297,41 @@
"debian-x86" "debian-x86"
] ]
}, },
+ "exherbo": { + "debian.11": {
+ "#import": [ + "#import": [
+ "linux" + "debian"
+ ] + ]
+ }, + },
+ "exherbo-x64": { + "debian.11-arm": {
+ "#import": [ + "#import": [
+ "exherbo", + "debian.11",
+ "linux-x64" + "debian-arm"
+ ] + ]
+ }, + },
"fedora": { + "debian.11-arm64": {
+ "#import": [
+ "debian.11",
+ "debian-arm64"
+ ]
+ },
+ "debian.11-armel": {
+ "#import": [
+ "debian.11",
+ "debian-armel"
+ ]
+ },
+ "debian.11-x64": {
+ "#import": [
+ "debian.11",
+ "debian-x64"
+ ]
+ },
+ "debian.11-x86": {
+ "#import": [
+ "debian.11",
+ "debian-x86"
+ ]
+ },
"debian.8": {
"#import": [ "#import": [
"linux" "debian"
@@ -533,6 +555,23 @@ @@ -1428,6 +1474,57 @@
"fedora-x64"
]
},
+ "fedora.35": {
+ "#import": [
+ "fedora"
+ ]
+ },
+ "fedora.35-arm64": {
+ "#import": [
+ "fedora.35",
+ "fedora-arm64"
+ ]
+ },
+ "fedora.35-x64": {
+ "#import": [
+ "fedora.35",
+ "fedora-x64"
+ ]
+ },
"freebsd": {
"#import": [
"unix"
@@ -1356,6 +1395,57 @@
"rhel-x64" "rhel-x64"
] ]
}, },
@ -314,63 +331,56 @@ diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.P
+ "rosa-x64" + "rosa-x64"
+ ] + ]
+ }, + },
+ "rosa.2019.1": { + "rosa.2021.1": {
+ "#import": [ + "#import": [
+ "rosa" + "rosa"
+ ] + ]
+ }, + },
+ "rosa.2019.1-arm64": { + "rosa.2021.1-arm64": {
+ "#import": [ + "#import": [
+ "rosa.2019.1", + "rosa.2021.1",
+ "rosa-arm64" + "rosa-arm64"
+ ] + ]
+ }, + },
+ "rosa.2019.1-x64": { + "rosa.2021.1-x64": {
+ "#import": [ + "#import": [
+ "rosa.2019.1", + "rosa.2021.1",
+ "rosa-x64" + "rosa-x64"
+ ] + ]
+ }, + },
"sles": { "sles": {
"#import": [ "#import": [
"linux" "linux"
diff -ur corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props corefx.50a99d5d3c6e68aecf70627897c0d862a92fc283-diff/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-02-27 22:01:04.000000000 +0300 index 0e8d06d..846a80d 100644
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-03-19 15:40:31.863898850 +0300 --- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
<RuntimeGroup Include="alpine"> <RuntimeGroup Include="alpine">
<Parent>linux-musl</Parent> <Parent>linux-musl</Parent>
<Architectures>x64</Architectures> <Architectures>x64</Architectures>
- <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12</Versions> - <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions>
+ <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions> + <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14</Versions>
</RuntimeGroup> </RuntimeGroup>
<RuntimeGroup Include="android"> <RuntimeGroup Include="android">
@@ -40,10 +40,15 @@ @@ -43,7 +43,7 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible> <RuntimeGroup Include="debian">
</RuntimeGroup>
+ <RuntimeGroup Include="exherbo">
+ <Parent>linux</Parent>
+ <Architectures>x64</Architectures>
+ </RuntimeGroup>
+
<RuntimeGroup Include="fedora">
<Parent>linux</Parent> <Parent>linux</Parent>
<Architectures>x64;arm64</Architectures> <Architectures>x64;x86;arm;armel;arm64</Architectures>
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions> - <Versions>8;9;10</Versions>
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35</Versions> + <Versions>8;9;10;11</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible> <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup> </RuntimeGroup>
@@ -125,6 +130,13 @@ @@ -137,6 +137,13 @@
<Versions>9</Versions> <Versions>9</Versions>
</RuntimeGroup> </RuntimeGroup>
+ <RuntimeGroup Include="rosa"> + <RuntimeGroup Include="rosa">
+ <Parent>linux</Parent> + <Parent>linux</Parent>
+ <Architectures>x64;arm64</Architectures> + <Architectures>x64;arm64</Architectures>
+ <Versions>2019.1;2019.05</Versions> + <Versions>2021.1;2019.05</Versions>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible> + <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup> + </RuntimeGroup>
+ +

104
dotnet-pull10652.patch
View file

@ -1,104 +0,0 @@
From 49891b96c12567109d6086a23ca7c117dd40bdc7 Mon Sep 17 00:00:00 2001
From: sfoslund <sfoslund@microsoft.com>
Date: Fri, 14 Feb 2020 15:05:24 -0800
Subject: [PATCH] Resolving and adding test coverage for stack dump on dotnet
-d
---
.../LocalToolsCommandResolver.cs | 3 +-
src/Cli/dotnet/Program.cs | 4 +++
.../GivenALocalToolsCommandResolver.cs | 13 ++++++++
.../CommandTests/CommandIntegrationTests.cs | 31 +++++++++++++++++++
4 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 src/Tests/dotnet.Tests/CommandTests/CommandIntegrationTests.cs
diff --git a/src/dotnet/CommandFactory/CommandResolution/LocalToolsCommandResolver.cs b/src/dotnet/CommandFactory/CommandResolution/LocalToolsCommandResolver.cs
index fae180cbde..59af704755 100644
--- a/src/dotnet/CommandFactory/CommandResolution/LocalToolsCommandResolver.cs
+++ b/src/dotnet/CommandFactory/CommandResolution/LocalToolsCommandResolver.cs
@@ -57,7 +57,8 @@ public CommandSpec Resolve(CommandResolverArguments arguments)
return null;
}
- if (!arguments.CommandName.StartsWith(LeadingDotnetPrefix, StringComparison.OrdinalIgnoreCase))
+ if (!arguments.CommandName.StartsWith(LeadingDotnetPrefix, StringComparison.OrdinalIgnoreCase) ||
+ string.IsNullOrWhiteSpace(arguments.CommandName.Substring(LeadingDotnetPrefix.Length)))
{
return null;
}
diff --git a/src/dotnet/Program.cs b/src/dotnet/Program.cs
index 8b9cccfe0b..67e784bbf3 100644
--- a/src/dotnet/Program.cs
+++ b/src/dotnet/Program.cs
@@ -216,6 +216,10 @@ internal static int ProcessArgs(string[] args, ITelemetry telemetryClient = null
exitCode = builtIn.Command(appArgs.ToArray());
}
+ else if (string.IsNullOrEmpty(topLevelCommandParserResult.Command))
+ {
+ exitCode = 0;
+ }
else
{
CommandResult result = CommandFactoryUsingResolver.Create(
diff --git a/test/Microsoft.DotNet.CommandFactory.Tests/GivenALocalToolsCommandResolver.cs b/test/Microsoft.DotNet.CommandFactory.Tests/GivenALocalToolsCommandResolver.cs
index 4235f2055e..07bd774c97 100644
--- a/test/Microsoft.DotNet.CommandFactory.Tests/GivenALocalToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.CommandFactory.Tests/GivenALocalToolsCommandResolver.cs
@@ -79,6 +79,19 @@ public void WhenResolveItCanFindToolExecutable(string toolCommand)
commandPath.Should().Be(fakeExecutable.Value);
}
+ [Fact]
+ public void WhenResolveWithNoArgumentsItReturnsNull()
+ {
+ (FilePath fakeExecutable, LocalToolsCommandResolver localToolsCommandResolver) = DefaultSetup("-d");
+
+ var result = localToolsCommandResolver.Resolve(new CommandResolverArguments()
+ {
+ CommandName = "-d",
+ });
+
+ result.Should().BeNull();
+ }
+
private (FilePath, LocalToolsCommandResolver) DefaultSetup(string toolCommand)
{
NuGetVersion packageVersionA = NuGetVersion.Parse("1.0.4");
diff --git a/test/dotnet.Tests/CommandTests/CommandIntegrationTests.cs b/test/dotnet.Tests/CommandTests/CommandIntegrationTests.cs
new file mode 100644
index 0000000000..30e5bfdbb7
--- /dev/null
+++ b/test/dotnet.Tests/CommandTests/CommandIntegrationTests.cs
@@ -0,0 +1,31 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using FluentAssertions;
+using Microsoft.NET.TestFramework;
+using Microsoft.NET.TestFramework.Commands;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.DotNet.Tests.Commands
+{
+ public class CommandIntegrationTests : SdkTest
+ {
+ public CommandIntegrationTests(ITestOutputHelper log) : base(log) {}
+
+ [Fact]
+ public void GivenNoArgumentsProvided()
+ {
+ var cmd = new DotnetCommand(Log).Execute(string.Empty);
+ cmd.StdErr.Should().BeEmpty();
+ }
+
+ [Fact]
+ public void GivenOnlyArgumentProvidedIsDiagnosticsFlag()
+ {
+ var cmd = new DotnetCommand(Log).Execute("-d");
+ cmd.ExitCode.Should().Be(0);
+ cmd.StdErr.Should().BeEmpty();
+ }
+ }
+}

37
dotnet3.1.spec
View file

@ -29,10 +29,10 @@
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%global host_version 3.1.12 %global host_version 3.1.18
%global runtime_version 3.1.12 %global runtime_version 3.1.18
%global aspnetcore_runtime_version %{runtime_version} %global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.112 %global sdk_version 3.1.118
# upstream can update releases without revving the SDK version so these don't always match # upstream can update releases without revving the SDK version so these don't always match
%global src_version %{sdk_version} %global src_version %{sdk_version}
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@ -60,10 +60,11 @@
%endif %endif
%global runtime_id %{distsuffix}.%{rosa_release}*-%{runtime_arch} %global runtime_id %{distsuffix}.%{rosa_release}*-%{runtime_arch}
%bcond_with identifier_platform_rosa
Name: dotnet3.1 Name: dotnet3.1
Version: %{sdk_rpm_version} Version: %{sdk_rpm_version}
Release: 4 Release: 1
Summary: .NET Core Runtime and SDK Summary: .NET Core Runtime and SDK
Group: Development/Other Group: Development/Other
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
@ -71,7 +72,7 @@ URL: https://github.com/dotnet/
# The source is generated on a Fedora box via: # The source is generated on a Fedora box via:
# ./build-dotnet-tarball v%%{src_version}-SDK # ./build-dotnet-tarball v%%{src_version}-SDK
Source0: dotnet-v%{src_version}-SDK.tar.gz Source0: dotnet-v%{src_version}-SDK%{?_with_bootstrap:-original}.tar.gz
Source1: check-debug-symbols.py Source1: check-debug-symbols.py
Source2: dotnet.sh.in Source2: dotnet.sh.in
@ -79,8 +80,7 @@ Patch1: source-build-warnings-are-not-errors.patch
# Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS # Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS
Patch100: corefx-optflags-support.patch Patch100: corefx-optflags-support.patch
#Add some support for cgroupv2 in corefx
# Add some support for cgroupv2 in corefx
# All these patches are upstreamed for 5.0 # All these patches are upstreamed for 5.0
Patch101: corefx-39686-cgroupv2-01.patch Patch101: corefx-39686-cgroupv2-01.patch
Patch102: corefx-39686-cgroupv2-02.patch Patch102: corefx-39686-cgroupv2-02.patch
@ -89,8 +89,6 @@ Patch103: corefx-39633-cgroupv2-mountpoints.patch
# https://github.com/dotnet/source-build/issues/2095 # https://github.com/dotnet/source-build/issues/2095
Patch104: corefx-Rosalinux-groups.patch Patch104: corefx-Rosalinux-groups.patch
# Build with with hardening flags, including -pie
Patch200: coreclr-hardening-flags.patch
# Fix build with clang 10; Already applied at tarball-build time # Fix build with clang 10; Already applied at tarball-build time
# Patch201: coreclr-clang10.patch # Patch201: coreclr-clang10.patch
# Fix build on recent versions of gcc/clang # Fix build on recent versions of gcc/clang
@ -98,18 +96,12 @@ Patch200: coreclr-hardening-flags.patch
# Already applied # Already applied
#Patch202: coreclr-libunwind-fno-common.patch #Patch202: coreclr-libunwind-fno-common.patch
# Build with with hardening flags, including -pie
Patch300: core-setup-hardening-flags.patch
Patch301: core-setup-gcc11.patch
# Disable telemetry by default; make it opt-in # Disable telemetry by default; make it opt-in
Patch500: cli-telemetry-optout.patch Patch500: cli-telemetry-optout.patch
# fix RID bootstrap, do it once # fix RID bootstrap, do it once
Patch501: RuntimeIdentifierGraph-Rosa.patch Patch501: RuntimeIdentifierGraph-Rosa.patch
# https://github.com/dotnet/sdk/pull/10652
Patch502: dotnet-pull10652.patch
ExclusiveArch: aarch64 x86_64 ExclusiveArch: x86_64
BuildRequires: clang BuildRequires: clang
BuildRequires: cmake BuildRequires: cmake
@ -338,7 +330,7 @@ These are not meant for general use.
%prep %prep
%setup -q -n dotnet-v%{src_version}-SDK %setup -q -n dotnet-v%{src_version}-SDK%{?_with_bootstrap:-original}
# https://github.com/dotnet/source-build/issues/1689 # https://github.com/dotnet/source-build/issues/1689
find . -type f -exec touch {} + find . -type f -exec touch {} +
@ -374,23 +366,21 @@ pushd src/corefx.*
%patch101 -p1 %patch101 -p1
%patch102 -p1 %patch102 -p1
%patch103 -p1 %patch103 -p1
%if %{with identifier_platform_rosa}
%patch104 -p1 %patch104 -p1
%endif
popd popd
pushd src/coreclr.* pushd src/coreclr.*
%patch200 -p1
#%%patch201 -p1 #%%patch201 -p1
#%%patch202 -p1 #%%patch202 -p1
popd popd
pushd src/core-setup.* pushd src/core-setup.*
%patch300 -p1
%patch301 -p1
popd popd
pushd src/cli.* pushd src/cli.*
%patch500 -p1 %patch500 -p1
%patch502 -p1
popd popd
# If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back
@ -417,12 +407,7 @@ cat /etc/os-release
%if %{without bootstrap} %if %{without bootstrap}
# We need to create a copy because we will mutate this # We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet cp -a %{_libdir}/dotnet previously-built-dotnet
%if 1
pushd previously-built-dotnet
patch -p1 < %{P:501}
popd
%endif %endif
%endif
%if 0%{?fedora} > 32 || 0%{?rhel} > 8 %if 0%{?fedora} > 32 || 0%{?rhel} > 8
# Setting this macro ensures that only clang supported options will be # Setting this macro ensures that only clang supported options will be