From 91caa7d21ca963502f8e624603c749d4bd129598 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 13 Feb 2023 22:50:32 +0100 Subject: [PATCH] [automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15514) Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai Co-authored-by: Matt Mitchell Co-authored-by: Michael Simons Co-authored-by: Logan Bussell Co-authored-by: Chris Rummel Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: dotnet-bot Co-authored-by: DotNet-Bot Co-authored-by: Sean Reeser Co-authored-by: Marc Paine Co-authored-by: William Godbe 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 Co-authored-by: Daniel Plaisted --- .../src/Tarball_WriteSourceRepoProperties.cs | 1 - .../tarball/content/Directory.Build.props | 14 +++++------ .../pipelines/security-partners-dotnet.yml | 15 +++++++++++- .../content/repos/Directory.Build.props | 4 +++- .../tarball/content/repos/fsharp.proj | 1 - .../tarball/content/repos/xliff-tasks.proj | 2 -- test/SdkTests/SdkTests.csproj | 5 ++++ test/SdkTests/TestsToSkipOSX.xml | 23 +++++++++++++++++++ 8 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 test/SdkTests/TestsToSkipOSX.xml diff --git a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs index b177b6f01..0dc26774e 100644 --- a/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs +++ b/src/SourceBuild/Arcade/src/Tarball_WriteSourceRepoProperties.cs @@ -71,7 +71,6 @@ namespace Microsoft.DotNet.SourceBuild.Tasks ["OfficialBuildId"] = derivedVersion.OfficialBuildId, ["OutputPackageVersion"] = dependency.Version, ["PreReleaseVersionLabel"] = derivedVersion.PreReleaseVersionLabel, - ["IsStable"] = string.IsNullOrWhiteSpace(derivedVersion.PreReleaseVersionLabel) ? "true" : "false", }; if (!string.IsNullOrEmpty(dependency.GitCommitCount)) { diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 6ca72bb7a..2f4a8ee71 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -216,13 +216,13 @@ - + - + - - - + + + @@ -238,8 +238,8 @@ - - + + diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 6200e7fc0..02641873b 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -1,5 +1,18 @@ trigger: none +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + jobs: - template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml parameters: @@ -7,7 +20,7 @@ jobs: excludeSdkContentTests: true matrix: Ubuntu2004-Offline: - _BootstrapPrep: false + _BootstrapPrep: true _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-20220813234344-4c008dd _EnablePoison: false _ExcludeOmniSharpTests: false diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props index 04ab89d11..625d3fb5b 100644 --- a/src/SourceBuild/tarball/content/repos/Directory.Build.props +++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props @@ -15,7 +15,6 @@ true $(LoggingDir)$(RepositoryName).log >> $(RepoConsoleLogFile) 2>&1 - true $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/ @@ -99,6 +98,9 @@ + + + diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj index 3ffd14406..bc9a10be7 100644 --- a/src/SourceBuild/tarball/content/repos/fsharp.proj +++ b/src/SourceBuild/tarball/content/repos/fsharp.proj @@ -27,7 +27,6 @@ - $(StandardSourceBuildArgs) - - $(BuildCommandArgs) /p:CheckEolTargetFramework=false $(StandardSourceBuildCommand) $(BuildCommandArgs) false diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index b99346824..9fb5965a4 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" + + diff --git a/test/SdkTests/TestsToSkipOSX.xml b/test/SdkTests/TestsToSkipOSX.xml new file mode 100644 index 000000000..09330bb1f --- /dev/null +++ b/test/SdkTests/TestsToSkipOSX.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + +