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

Merge branch 'release/7.0.2xx' of https://github.com/dotnet/installer into darc-release/7.0.2xx-efee8379-f108-419f-ad6e-1630ce4a9c83

Browse source
This commit is contained in:
Jason Zhai 2023-05-04 01:50:30 -07:00
commit b14e42c3a8
5 changed files with 24 additions and 5 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: '' _RuntimeIdentifier: ''
_BuildArchitecture: 'x64' _BuildArchitecture: 'x64'
_TestArg: $(_NonWindowsTestArg) _TestArg: $(_NonWindowsTestArg)
Build_Debian_Stretch_Debug_x64: Build_Debian_11_Debug_x64:
_BuildConfig: Debug _BuildConfig: Debug
_DockerParameter: '--docker debian' _DockerParameter: '--docker debian'
_LinuxPortable: '' _LinuxPortable: ''

4
eng/Versions.props
View file

@ -8,7 +8,7 @@
<VersionMajor>7</VersionMajor> <VersionMajor>7</VersionMajor>
<VersionMinor>0</VersionMinor> <VersionMinor>0</VersionMinor>
<VersionSDKMinor>2</VersionSDKMinor> <VersionSDKMinor>2</VersionSDKMinor>
<VersionFeature>04</VersionFeature> <VersionFeature>06</VersionFeature>
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix> <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel> <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<PreReleaseVersionIteration> <PreReleaseVersionIteration>
@ -23,7 +23,7 @@
<VersionFeature21>30</VersionFeature21> <VersionFeature21>30</VersionFeature21>
<VersionFeature31>32</VersionFeature31> <VersionFeature31>32</VersionFeature31>
<VersionFeature50>17</VersionFeature50> <VersionFeature50>17</VersionFeature50>
<VersionFeature60>$([MSBuild]::Add($(VersionFeature), 13))</VersionFeature60> <VersionFeature60>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature60>
</PropertyGroup> </PropertyGroup>
<!-- Restore feeds --> <!-- Restore feeds -->
<PropertyGroup Label="Restore feeds"> <PropertyGroup Label="Restore feeds">

8
eng/docker/debian/Dockerfile
View file

@ -4,7 +4,7 @@
# #
# Dockerfile that creates a container suitable to build dotnet-cli # 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 # Install the deb packaging toolchain we need to build debs
RUN apt-get update \ 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 # liblldb is needed so deb package build does not throw missing library info errors
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install liblldb-3.9 \ && apt-get -y install liblldb-9 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# Misc Dependencies for build # Misc Dependencies for build
@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
sudo && \ sudo && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt/lists/* 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 RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8

5
test/SdkTests/SdkTests.csproj
View file

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