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

[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15279)

Browse source 
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
This commit is contained in:
dotnet-maestro-bot 2023-02-08 00:15:41 +01:00 committed by GitHub
parent 959861970b
commit 535d6f657c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/SourceBuild/tarball/content/repos/Directory.Build.props
View file

@ -98,6 +98,9 @@
<EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" /> <EnvironmentVariables Include="DeterministicSourcePaths=false" Condition="'$(DeterministicBuildOptOut)' == 'true'" />
<EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" /> <EnvironmentVariables Include="SourceRoot=$(ProjectDirectory)" />
<!-- https://github.com/dotnet/source-build/issues/3081 -->
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'"> <ItemGroup Condition="'$(EnableExtraDebugging)' == 'true'">

1
src/SourceBuild/tarball/content/repos/fsharp.proj
View file

@ -27,7 +27,6 @@
<ItemGroup> <ItemGroup>
<UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" /> <UseSourceBuiltSdkOverride Include="@(ArcadeSdkOverride)" />
<EnvironmentVariables Include="CheckEolTargetFramework=false" />
</ItemGroup> </ItemGroup>
<Target Name="SetArcadeSdkDir" <Target Name="SetArcadeSdkDir"

2
src/SourceBuild/tarball/content/repos/xliff-tasks.proj
View file

@ -3,8 +3,6 @@
<PropertyGroup> <PropertyGroup>
<BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs> <BuildCommandArgs>$(StandardSourceBuildArgs)</BuildCommandArgs>
<!-- Repo has netcoreapp2.1 projects: https://github.com/dotnet/xliff-tasks/issues/508 -->
<BuildCommandArgs>$(BuildCommandArgs) /p:CheckEolTargetFramework=false</BuildCommandArgs>
<BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand> <BuildCommand>$(StandardSourceBuildCommand) $(BuildCommandArgs)</BuildCommand>
<RepoApiImplemented>false</RepoApiImplemented> <RepoApiImplemented>false</RepoApiImplemented>

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('OSX')) ">
<!-- Add list of tests to skip on Linux Portable -->
<TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml"</TestArgs>
</PropertyGroup>
<Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)" <Exec Command="$(ToolRunPrefix)$(RedistLayoutPath)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
WorkingDirectory="$(TestLocalToolFolder)" WorkingDirectory="$(TestLocalToolFolder)"
EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/> EnvironmentVariables="DOTNET_CLI_HOME=$(DOTNET_CLI_HOME)"/>

23
test/SdkTests/TestsToSkipOSX.xml Normal file
View file

@ -0,0 +1,23 @@
<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="SupportsTargetFramework crashes on Mac, probably fixed with https://github.com/dotnet/sdk/pull/29083"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Reason="Test assumes test process architecture is the same as architecture under test"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder"
Skip="true"
Reason="Test assumes test process architecture is the same as architecture under test"/>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
Skip="true"
Reason="Test assumes test process architecture is the same as architecture under test"/>
<Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
Skip="true"
Reason="Test assumes test process architecture is the same as architecture under test"/>
</SkippedTests>
</Tests>