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

Merged PR 31376: [internal/release/6.0.1xx] Merge from public

Browse source 
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
This commit is contained in:
Matt Mitchell 2023-05-19 16:48:52 +00:00
commit d01457385e
8 changed files with 34 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.vsts-ci.yml
View file

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

12
eng/Version.Details.xml
View file

@ -197,19 +197,19 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23167.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.23211.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<Sha>7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-servicing.22570.2">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
View file

@ -19,7 +19,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23167.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.23211.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->

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
@ -28,6 +28,10 @@ RUN rm -rf /var/lib/apt/lists/* && \
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
# Setup User to match Host User, and give superuser permissions

6
global.json
View file

@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "6.0.115",
"dotnet": "6.0.116",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)"
@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23167.1"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23211.7"
}
}

2
src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
View file

@ -85,7 +85,7 @@ jobs:
- ${{ if ne(parameters.excludeSdkContentTests, 'true') }}:
- download: ${{ parameters.installerBuildResourceId }}
artifact: BlobArtifacts
patterns: '**/dotnet-sdk-!(*-*)-linux-${{ parameters.architecture }}.tar.gz'
patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz'
displayName: Download MSFT sdk Tarball
- ${{ if eq(parameters.usePreviousArtifacts, 'true') }}:

7
test/SdkTests/SdkTests.csproj
View file

@ -258,7 +258,12 @@
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml"</TestArgs>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
<PropertyGroup Condition=" $([MSBuild]::IsOSPlatform('Linux')) ">
<!-- Add list of tests to skip on Linux -->
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml"</TestArgs>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>
</Target>

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>