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

Merged PR 31204: [internal/release/7.0.1xx] Merge from public

Browse source 
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
This commit is contained in:
Matt Mitchell 2023-05-15 20:41:32 +00:00
commit b348fd403f
6 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

@ -174,7 +174,7 @@ stages:
_RuntimeIdentifier: ''
_BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg)
Build_Debian_Stretch_Debug_x64:
Build_Debian_11_Debug_x64:
_BuildConfig: Debug
_DockerParameter: '--docker debian'
_LinuxPortable: ''

4
eng/Version.Details.xml
View file

@ -207,9 +207,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>7c5e5a782c67460b123c8e41d484ebcca8002c93</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23063.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>9964206e0dd215eee4ed199b9041a94e16ba4c45</Sha>
<Sha>525b6c35cc5c5c9b80b47044be2e4e77858d505a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-22429-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">

8
eng/docker/debian/Dockerfile
View file

@ -4,7 +4,7 @@
#
# Dockerfile that creates a container suitable to build dotnet-cli
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
# Install the deb packaging toolchain we need to build debs
RUN apt-get update \
@ -17,7 +17,7 @@ RUN apt-get update \
# liblldb is needed so deb package build does not throw missing library info errors
RUN apt-get update \
&& apt-get -y install liblldb-3.9 \
&& apt-get -y install liblldb-9 \
&& rm -rf /var/lib/apt/lists/*
# Misc Dependencies for build
@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
sudo && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
RUN apt-get update \
&& apt-get -y install python-is-python2 \
&& rm -rf /var/lib/apt/lists/*
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8

12
eng/source-build-tarball-build-official.yml
View file

@ -7,14 +7,10 @@ resources:
trigger:
branches:
include:
- main
- release/*
- internal/release/*
exclude:
- release/6.0.3xx
- internal/release/6.0.3xx
- release/6.0.4xx
- internal/release/6.0.4xx
- release/6.0.1xx
- internal/release/6.0.1xx
- release/7.0.1xx
- internal/release/7.0.1xx
stages:
- build

5
test/SdkTests/SdkTests.csproj
View file

@ -225,6 +225,11 @@
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
</PropertyGroup>
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('Linux')) ">
<!-- Add list of tests to skip on Linux -->
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"</TestArgs>
</PropertyGroup>
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('OSX')) ">
<!-- Add list of tests to skip on Linux Portable -->
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml"</TestArgs>

10
test/SdkTests/TestsToSkipLinux.xml Normal file
View file

@ -0,0 +1,10 @@
<Tests>
<SkippedTests>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run"
Skip="true"
Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output"
Skip="true"
Reason=".NET Core 1.1 fails to publish on distributions with unsupported RIDs."/>
</SkippedTests>
</Tests>