diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a142243b..29583a802 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/windowsdesktop - 2cc342a803fb933793ea3d67d4c5fdd150a64533 + 0c003a14ab4baa5f5bf256575ae94f4fd88b45b7 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 @@ -52,142 +52,142 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/aspnetcore - a020933a662680d4628bcbb087f6b1a19f037bd0 + 10bc40cf7bec57ecf9d2ffd9a7501b34a28d1f18 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 - + https://github.com/dotnet/sdk - 9d732b9cf69896f944a238670eed7edf41127af4 + 9e5ed21803179f9bfa4dd179c621f9d7bd4f2104 https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/test-templates - 3337ce19e6fb3365f80f69df56c77c87d308db1d + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/winforms - 1bd0529d3697f0306ea49be0e26f74fb20d0b069 + 4eae6075b679fb57727d7bee8a6eefd5929aec03 - + https://github.com/dotnet/wpf - dabde7a9730980eb455ae014573aff73de337729 + 026f338641b847dace824f36376beae5f5ad021a - + https://github.com/dotnet/fsharp - d55c3ef1b3dc620a5b6e4ad061633139f06ee44e + f3f18c65e6f2bfb42d1f4fb154678fbf7265f4f0 - + https://github.com/dotnet/fsharp - d55c3ef1b3dc620a5b6e4ad061633139f06ee44e + f3f18c65e6f2bfb42d1f4fb154678fbf7265f4f0 - + https://github.com/microsoft/vstest - f60b983c0fd2eb2974938b5ea3ba15529ed99d14 + d21ac0a0dfe6360fab8d9f4003003d41daa26ebb - + https://github.com/dotnet/runtime - e71faeeeccba29c1f06c7020929cfdadbd32401e + e89794659669cb7bb967db73a7ea6889c3891727 - + https://github.com/dotnet/roslyn - 299843030dd6eb08888875285791de0c00893a99 + 51e650881144535940dd6502cd3b34382b5c5cc8 - + https://github.com/dotnet/msbuild - b3989dc43a984b7fbeffb7881ae5bfc9cc793126 + 0cf89d3b27af71d0e065e4c69ee030cfe26b90c5 - + https://github.com/nuget/nuget.client - 84ba85d08b27afaa38ad4ae4e7e1684c74e9567c + c94490d7af33f4198ed552787623cf9227996006 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 3a52d07cd6a500d81d9cee79cbc8f0b9a90e1dbf + abfa03c97f4175d4d209435cd0e71f558e36c3fd - + https://github.com/dotnet/deployment-tools - 9e870996b8bf0b91a791edd1039bfd23bdd01af8 + 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/deployment-tools - 9e870996b8bf0b91a791edd1039bfd23bdd01af8 + 850f61abed37b617a41fd59b63a37c284af6801d - + https://github.com/dotnet/source-build-externals - f005d269d4c195f2b912741b6de9283db47f7a3a + 72f5ac04ce80508c7a7d7aaba4ecf7df51c5eca2 @@ -206,18 +206,18 @@ - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 46ff142f43e887d5f9a4d87ef39d72166f61db8d - + https://github.com/dotnet/arcade - bebd2de1988036b47ecefc7e72b66ce2f403e43d + 46ff142f43e887d5f9a4d87ef39d72166f61db8d https://github.com/dotnet/arcade-services @@ -231,14 +231,14 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 41f1a158d460e11ded6cffd6340f9e671e2b0a5c + 45f5554ac6813e1e155c47fd80ec146c684f65e8 - + https://github.com/dotnet/xliff-tasks - 493329204079519072f0241ed26f692bdee0d60c + 649a1e75101b701d753ee41efbe9038f9b23a0db diff --git a/eng/Versions.props b/eng/Versions.props index 36e38f934..05a26ddc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ true - 8 + 9 0 1 00 @@ -16,7 +16,7 @@ false release - rc + alpha rtm servicing 1 @@ -39,7 +39,7 @@ - 8.0.0-beta.23409.5 + 8.0.0-beta.23415.4 @@ -47,11 +47,11 @@ - 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23411.1 - 8.0.0-rc.1.23380.1 + 8.0.0-rc.1.23412.1 @@ -60,10 +60,10 @@ 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 - 1.1.0-rc.23409.2 - 1.1.0-rc.23409.2 - 1.1.0-rc.23409.2 - 1.1.0-rc.23409.2 + 1.1.0-rc.23415.2 + 1.1.0-rc.23415.2 + 1.1.0-rc.23415.2 + 1.1.0-rc.23415.2 @@ -71,50 +71,50 @@ - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 - 8.0.0-rc.1.23401.1 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 + 8.0.0-rc.1.23414.10 0.2.0 - 8.0.100-rc.1.23401.23 - 8.0.100-rc.1.23401.23 - 8.0.100-rc.1.23401.23 + 8.0.100-rc.1.23414.10 + 8.0.100-rc.1.23414.10 + 8.0.100-rc.1.23414.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-1.23401.1 + 4.8.0-1.23414.4 - 8.0.0-rc.1.23381.3 + 8.0.0-rc.1.23414.4 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 - 8.0.0-rc.1.23381.3 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 + 8.0.0-rc.1.23414.4 2.1.0 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 - 8.0.0-rc.1.23381.1 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 + 8.0.0-rc.1.23412.3 @@ -126,11 +126,11 @@ - 6.8.0-preview.1.49 + 6.8.0-preview.1.60 - 1.0.0-preview.6.23206.1 + 1.0.0-preview.6.23407.1 @@ -231,7 +231,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-preview-23381-02 + 17.8.0-preview-23407-02 8.0.0-alpha.1.22557.12 @@ -244,7 +244,7 @@ 13.3.8646-net8-p6 16.4.8646-net8-p6 - 8.0.0-rc.1.23377.1 + 8.0.0-rc.1.23411.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e9972394..6c65e8192 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password } -$dotnetVersions = @('5','6','7') +$dotnetVersions = @('5','6','7','8') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 8af7d899d..d387c7eac 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7') +DotNetVersions=('5' '6' '7' '8') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index aba9fe240..de1687b2c 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -79,7 +79,6 @@ getNonPortableDistroRid() # Input: # os: (str) # arch: (str) -# isPortable: (int) # rootfsDir?: (nullable:string) # # Return: @@ -97,10 +96,9 @@ initDistroRidGlobal() { local targetOs="$1" local targetArch="$2" - local isPortable="$3" local rootfsDir="" - if [ "$#" -ge 4 ]; then - rootfsDir="$4" + if [ "$#" -ge 3 ]; then + rootfsDir="$3" fi if [ -n "${rootfsDir}" ]; then diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 new file mode 100644 index 000000000..d8cfec910 --- /dev/null +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -0,0 +1,75 @@ +<# +.SYNOPSIS +Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name. + +.PARAMETER InputPath +Full path to directory where artifact packages are stored + +.PARAMETER Recursive +Search for NuGet packages recursively + +#> + +Param( + [string] $InputPath, + [bool] $Recursive = $true +) + +$CliToolName = "Microsoft.DotNet.VersionTools.Cli" + +function Install-VersionTools-Cli { + param( + [Parameter(Mandatory=$true)][string]$Version + ) + + Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." + $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" + + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version") + Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait +} + +# ------------------------------------------------------------------- + +if (!(Test-Path $InputPath)) { + Write-Host "Input Path '$InputPath' does not exist" + ExitWithExitCode 1 +} + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +$disableConfigureToolsetImport = $true +$global:LASTEXITCODE = 0 + +# `tools.ps1` checks $ci to perform some actions. Since the SDL +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +. $PSScriptRoot\..\tools.ps1 + +try { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + + $toolsetVersion = Read-ArcadeSdkVersion + Install-VersionTools-Cli -Version $toolsetVersion + + $cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName}) + if ($null -eq $cliToolFound) { + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed." + ExitWithExitCode 1 + } + + Exec-BlockVerbosely { + & "$dotnet" $CliToolName trim-assets-version ` + --assets-path $InputPath ` + --recursive $Recursive + Exit-IfNZEC "Sdl" + } +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ + ExitWithExitCode 1 +} \ No newline at end of file diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c9eced9f7..aa74ab4a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -671,6 +671,10 @@ function InitializeNativeTools() { } } +function Read-ArcadeSdkVersion() { + return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' +} + function InitializeToolset() { if (Test-Path variable:global:_ToolsetBuildProj) { return $global:_ToolsetBuildProj @@ -678,7 +682,7 @@ function InitializeToolset() { $nugetCache = GetNuGetPackageCachePath - $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' + $toolsetVersion = Read-ArcadeSdkVersion $toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt" if (Test-Path $toolsetLocationFile) { diff --git a/global.json b/global.json index 2d22f6104..ad6c72f15 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23409.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23409.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23415.4" } } diff --git a/run-build.sh b/run-build.sh index 3c9b27485..c380d75ce 100755 --- a/run-build.sh +++ b/run-build.sh @@ -63,4 +63,8 @@ while [[ $# > 0 ]]; do shift done +source $REPOROOT/eng/common/native/init-os-and-arch.sh +source $REPOROOT/eng/common/native/init-distro-rid.sh +initDistroRidGlobal "$os" "$arch" "" + . "$REPOROOT/eng/common/build.sh" --build --restore "${args[@]}" diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index df036b251..69262c7a8 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -4,7 +4,6 @@ false <_SuppressSdkImports>true Release - false @@ -159,6 +158,8 @@ + + $(__DistroRid) $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) Windows_NT @@ -166,10 +167,11 @@ Linux FreeBSD - freebsd-$(Platform) - osx-$(Platform) - linux-$(Platform) - win-$(Platform) + $(__PortableTargetOS)-$(Platform) + freebsd-$(Platform) + osx-$(Platform) + linux-$(Platform) + win-$(Platform) $(PortableRid) diff --git a/src/SourceBuild/content/build.proj b/src/SourceBuild/content/build.proj index 50c1b64f6..55e5a66c0 100644 --- a/src/SourceBuild/content/build.proj +++ b/src/SourceBuild/content/build.proj @@ -34,6 +34,22 @@ + + + + + + + + + + + - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-preview.7.23376.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-preview.7.23376.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.1.23410.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.1.23410.1-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 427138f99..a29dc5cc6 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3" + "dotnet": "8.0.100-rc.1.23410.12" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 62979df45..756a7f0a5 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -82,26 +82,5 @@ - - - - $(SourceBuiltAssetsDir)dotnet-sdk-*$(TarBallExtension) - - - - - - - - - - - - - diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index 4e9f3c82c..89d2631d8 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -5,6 +5,7 @@ $(SubmoduleDirectory)$(RepositoryName)/ true $(CurrentSourceBuiltPackageVersionPropsPath) + false + <_platformIndex>$(NETCoreSdkPortableRuntimeIdentifier.LastIndexOf('-')) + <_baseOS>$(NETCoreSdkPortableRuntimeIdentifier.Substring(0, $(_platformIndex))) + $(BuildCommandArgs) /p:PortableRid=$(_baseOS)-$(Platform) + $(BuildCommandArgs) /p:TargetRid=$(TargetRid) + $(BuildCommandArgs) /p:NativeAotSupported=false diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs index 5767955ac..cb008eccc 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/BasicScenarioTests.cs @@ -34,7 +34,8 @@ public class BasicScenarioTests : SmokeTests { yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.Console, // R2R is not supported on Mono (see https://github.com/dotnet/runtime/issues/88419#issuecomment-1623762676) - DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex | (helper.IsMonoRuntime ? DotNetActions.None : DotNetActions.PublishR2R)); + // Disable R2R tests due to https://github.com/dotnet/source-build/issues/3591 + DotNetActions.Build | DotNetActions.Run | DotNetActions.PublishComplex); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.ClassLib, DotNetActions.Build | DotNetActions.Publish); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.XUnit, DotNetActions.Test); yield return new(nameof(BasicScenarioTests), language, DotNetTemplate.NUnit, DotNetActions.Test); diff --git a/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch b/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch new file mode 100644 index 000000000..f8a5bc0de --- /dev/null +++ b/src/SourceBuild/patches/deployment-tools/0001-Disable-trimmable-for-DotNet.Releases-project.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Fri, 11 Aug 2023 12:03:41 -0500 +Subject: [PATCH] Disable trimmable for DotNet.Releases project + +Backport: https://github.com/dotnet/deployment-tools/issues/288 +--- + .../src/Microsoft.Deployment.DotNet.Releases.csproj | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj +index ee19600..2e50a3a 100644 +--- a/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj ++++ b/src/Microsoft.Deployment.DotNet.Releases/src/Microsoft.Deployment.DotNet.Releases.csproj +@@ -5,8 +5,8 @@ + 0 + 6 + true +- true +- true ++ false ++ false + + + diff --git a/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch b/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch deleted file mode 100644 index a9709002e..000000000 --- a/src/SourceBuild/patches/deployment-tools/0001-Remove-sourcelink-dependencies.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Thu, 20 Jul 2023 21:02:57 +0000 -Subject: [PATCH] Remove sourcelink dependencies - -Backport: https://github.com/dotnet/deployment-tools/issues/282 ---- - eng/Tools.props | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/eng/Tools.props b/eng/Tools.props -index e0c3314..c0569e2 100644 ---- a/eng/Tools.props -+++ b/eng/Tools.props -@@ -5,10 +5,4 @@ - <_RepoToolManifest Condition="'$(ContinuousIntegrationBuild)' == 'true'" /> - - -- -- -- -- -- -- - diff --git a/src/VirtualMonoRepo/allowed-binaries.txt b/src/VirtualMonoRepo/allowed-binaries.txt index 6ada74ae3..a1f63d6e1 100644 --- a/src/VirtualMonoRepo/allowed-binaries.txt +++ b/src/VirtualMonoRepo/allowed-binaries.txt @@ -20,6 +20,7 @@ **/TestCert*.pfx **/tests/* +eng/common/loc/*.lss # UTF16-LE text files **/eng/common/loc/*.lss # UTF16-LE text files src/aspnetcore/**/samples/* diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index dc3555023..658fff324 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -335,8 +335,11 @@ + + + Condition="'%(TemplatesMajorMinorVersion)' == '8.0'"/> @(LatestTemplateInstallerComponent->'%(MSIInstallerFile)') diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets index 6d216ff20..39f89415f 100644 --- a/src/redist/targets/GetRuntimeInformation.targets +++ b/src/redist/targets/GetRuntimeInformation.targets @@ -1,6 +1,8 @@ + + $(__DistroRid) $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier) win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 8d1384e3f..9fd750ded 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -408,7 +408,7 @@ namespace EndToEnd.Tests { string framework = DetectExpectedDefaultFramework(templateName); - if (RuntimeInformation.RuntimeIdentifier.StartsWith("alpine")) //linux musl + if (RuntimeInformation.RuntimeIdentifier.StartsWith("linux-musl")) { TestTemplateCreateAndBuild(templateName, build: false, framework: framework); }