diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04861689d..d0c4385d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -183,9 +183,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - 46f5e8e5419df6689022dccf5ed5a7fd153cb601 + 54b1cf7905203a71e6883d2a3b8ea61d487cefdb @@ -195,18 +195,18 @@ - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/arcade - 02980a654d20995c38eca6ceabf729c4c13412c4 + c4a85adbff520f62bfade7a6132f471506c3d35a https://github.com/dotnet/arcade-services @@ -220,19 +220,19 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - d8427722f537c3fbdc753dce52af1f104a8048d6 + abf867508a6c495f28afe610fa56e5767b1c3ff7 - + https://github.com/dotnet/sourcelink - 763c618bbc4cc6481d37d122dc0dd3c2cafbcd49 + 955e79b0b955a9f57078b2399a782fcde44a9261 - + https://github.com/dotnet/xliff-tasks - 3cb4fa02ba389a7f070a16c50227cba2e610b48d + 69157952aba0f08738249af4454b045b553614c4 diff --git a/eng/Versions.props b/eng/Versions.props index 7b5e822e8..b8ba016f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 8.0.0-beta.23106.4 + 8.0.0-beta.23120.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 1ebf454f3..ffaa88eb0 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" - echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine, alpine3.13 or alpine3.14. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen." - echo " for FreeBSD can be: freebsd12, freebsd13" - echo " for illumos can be: illumos" - echo " for Haiku can be: haiku." + echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" + echo " for alpine can be specified with version: alpineX.YY or alpineedge" + echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for illumos can be: illumos" + echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." @@ -145,35 +146,54 @@ while :; do __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" fi ;; - ppc64le) - __BuildArch=ppc64le - __UbuntuArch=ppc64el - __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" - __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" - __UbuntuPackages="${__UbuntuPackages// libomp5/}" - unset __LLDB_Package - ;; riscv64) __BuildArch=riscv64 + __AlpineArch=riscv64 + __AlpinePackages="${__AlpinePackages// lldb-dev/}" + __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" + __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" - __CodeName=sid __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" fi + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + fi + ;; + ppc64le) + __BuildArch=ppc64le + __AlpineArch=ppc64le + __QEMUArch=ppc64le + __UbuntuArch=ppc64el + __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" + __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp5/}" + unset __LLDB_Package + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + fi ;; s390x) __BuildArch=s390x + __AlpineArch=s390x + __QEMUArch=s390x __UbuntuArch=s390x __UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package + + if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + fi ;; x64) __BuildArch=x64 @@ -252,22 +272,53 @@ while :; do __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" ;; + bullseye) # Debian 11 + __CodeName=bullseye + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; + sid) # Debian sid + __CodeName=sid + __UbuntuRepo="http://ftp.debian.org/debian/" + ;; tizen) __CodeName= __UbuntuRepo= __Tizen=tizen ;; - alpine|alpine3.13) + alpine*) __CodeName=alpine __UbuntuRepo= - __AlpineVersion=3.13 - __AlpinePackages+=" llvm10-libs" - ;; - alpine3.14) - __CodeName=alpine - __UbuntuRepo= - __AlpineVersion=3.14 - __AlpinePackages+=" llvm11-libs" + version="${lowerI/alpine/}" + + if [[ "$version" == "edge" ]]; then + __AlpineVersion=edge + else + parts=(${version//./ }) + __AlpineMajorVersion="${parts[0]}" + __AlpineMinoVersion="${parts[1]}" + + if [[ -z "$__AlpineVersion" ]]; then + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + fi + fi + + case "$__AlpineVersion" in + 3.14) __AlpinePackages+=" llvm11-libs" ;; + 3.15) __AlpinePackages+=" llvm12-libs" ;; + 3.16) __AlpinePackages+=" llvm13-libs" ;; + 3.17) __AlpinePackages+=" llvm15-libs" ;; + edge) __AlpineLlvmLibsLookup=1 ;; + *) + if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then + __AlpineVersion=3.15 # minimum version that supports compiler-rt + __AlpinePackages+=" llvm12-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineLlvmLibsLookup=1 + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + else + __AlpineVersion=3.13 # 3.13 to maximize compatibility + fi + esac ;; freebsd12) __CodeName=freebsd @@ -341,18 +392,40 @@ mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" if [[ "$__CodeName" == "alpine" ]]; then - __ApkToolsVersion=2.9.1 + __ApkToolsVersion=2.12.11 __ApkToolsDir="$(mktemp -d)" - wget "https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -P "$__ApkToolsDir" - tar -xf "$__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz" -C "$__ApkToolsDir" + + wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + chmod +x "$__ApkToolsDir/apk.static" + mkdir -p "$__RootfsDir"/usr/bin cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" - "$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk" \ - -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + if [[ "$__AlpineVersion" == "edge" ]]; then + version=edge + else + version="v$__AlpineVersion" + fi + + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ + add $__AlpinePackages + + if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + add "$name-libs" + done + fi rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index bcb579e37..524aaa57f 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -45,7 +45,7 @@ if (-not $wxlFiles) { } } -$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html" } # add installer HTML files +$macosHtmlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\.lproj\\.+\.html$" } # add installer HTML files $macosHtmlFiles = @() if ($macosHtmlEnFiles) { $macosHtmlEnFiles | ForEach-Object { @@ -148,12 +148,17 @@ $locJson = @{ } } $sourceFile = ($_.FullName | Resolve-Path -Relative) + $lciFile = $sourceFile + ".lci" if ($continue) { - return @{ + $result = @{ SourceFile = $sourceFile CopyOption = "LangIDOnPath" OutputPath = $outputPath } + if (Test-Path $lciFile -PathType Leaf) { + $result["LciFile"] = $lciFile + } + return $result } } ) diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index fbc67effc..27ccdb9ec 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -83,7 +83,8 @@ try { Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { if ($PathPromotion -eq $True) { - if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value @@ -93,11 +94,6 @@ try { if ($ToolVersion -eq "latest") { $ToolVersion = "" } - $ArcadeToolsDirectory = "C:\arcade-tools" - if (-not (Test-Path $ArcadeToolsDirectory)) { - Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." - exit 1 - } $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." @@ -125,6 +121,7 @@ try { if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." } } exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index f0af425d9..61914a1fb 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,7 +134,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 inputs: buildType: current @@ -171,7 +171,7 @@ jobs: TeamName: $(_TeamName) - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - task: CopyFiles@2 displayName: Gather binaries for publish to artifacts inputs: @@ -192,7 +192,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - publish: artifacts/log artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} displayName: Publish logs diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 99c80212b..9cc5c550d 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,17 +1,17 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, # otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. # Motivation: # Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS # (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing -# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS) +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. # Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services # team needs to move resources around and create new and potentially differently-named pools. Using this template # file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. # How to use: # This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). -# If we find alternate naming conventions in broad usage these can be added to the condition below. +# If we find alternate naming conventions in broad usage it can be added to the condition below. # # First, import the template in an arcade-ified repo to pick up the variables, e.g.: # diff --git a/global.json b/global.json index 669d24dbf..e48079a73 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.23106.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23106.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23120.1" } } diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 091df71f6..58aeb46aa 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -25,6 +25,6 @@ necessary, and this property is removed from the file. --> 0.1.0-8.0.100-5.centos.8-x64 - 0.1.0-8.0.100-3.centos.8-x64 + 0.1.0-8.0.100-6.centos.8-x64 diff --git a/src/SourceBuild/content/repo-projects/cecil.proj b/src/SourceBuild/content/repo-projects/cecil.proj new file mode 100644 index 000000000..25ce5aa77 --- /dev/null +++ b/src/SourceBuild/content/repo-projects/cecil.proj @@ -0,0 +1,13 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + + + + + + + diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index d3058b5a5..7638bc189 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -49,6 +49,7 @@ + diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index 4c535e89c..8a96a14c8 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -12,6 +12,8 @@ true + + DependenciesOnly diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index a048b6a1f..ac56e1d16 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -8,6 +8,8 @@ true + + DependenciesOnly diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 3276c1cb4..3300d8daf 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -44,6 +44,31 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ +@@ ------------ @@ + ./packs/NETStandard.Library.Ref/x.y.z/ref/netstandard2.1/System.Xml.XPath.XDocument.dll + ./sdk-manifests/ + ./sdk-manifests/x.y.z/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.android/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.ios/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.maccatalyst/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.macos/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.maui/WorkloadManifest.targets +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/ +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.json +-./sdk-manifests/x.y.z/microsoft.net.sdk.tvos/WorkloadManifest.targets + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/ + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.json + ./sdk-manifests/x.y.z/microsoft.net.workload.emscripten.current/WorkloadManifest.targets @@ ------------ @@ ./sdk/x.y.z/AppHostTemplate/apphost ./sdk/x.y.z/cs/ @@ -57,8 +82,8 @@ index ------------ ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/cs/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/cs/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/cs/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/cs/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -96,10 +121,6 @@ index ------------ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ ./sdk/x.y.z/Current/Microsoft.Common.CrossTargeting.targets/ImportAfter/ @@ ------------ @@ - ./sdk/x.y.z/datacollector.deps.json - ./sdk/x.y.z/datacollector.dll - ./sdk/x.y.z/datacollector.dll.config --./sdk/x.y.z/datacollector.exe ./sdk/x.y.z/datacollector.runtimeconfig.json ./sdk/x.y.z/de/ ./sdk/x.y.z/de/dotnet.resources.dll @@ -112,8 +133,8 @@ index ------------ ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/de/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/de/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/de/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/de/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/de/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -147,9 +168,9 @@ index ------------ ./sdk/x.y.z/de/System.CommandLine.resources.dll -./sdk/x.y.z/de/Test.Utility.resources.dll -./sdk/x.y.z/de/vstest.console.resources.dll - ./sdk/x.y.z/dotnet-watch.deps.json - ./sdk/x.y.z/dotnet-watch.runtimeconfig.json ./sdk/x.y.z/dotnet.deps.json + ./sdk/x.y.z/dotnet.dll + ./sdk/x.y.z/dotnet.runtimeconfig.json @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-format/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -167,25 +188,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/pl/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/pl/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-format/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.CommandLine.Rendering.dll @@ -196,6 +213,7 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/System.Composition.TypedParts.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Drawing.Common.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/DotnetTools/dotnet-format/System.IO.Pipelines.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-format/System.Security.Permissions.dll @@ -204,13 +222,14 @@ index ------------ +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-format/System.Text.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-format/System.Threading.Channels.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.AnalyzerUtilities.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Elfie.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.Scripting.dll @@ -248,11 +267,12 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.IO.Pipelines.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ ------------ @@ - ./sdk/x.y.z/DotNetWatch.targets + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/zh-Hant/System.CommandLine.resources.dll ./sdk/x.y.z/es/ ./sdk/x.y.z/es/dotnet.resources.dll -./sdk/x.y.z/es/Microsoft.Build.NuGetSdkResolver.resources.dll @@ -264,8 +284,8 @@ index ------------ ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/es/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/es/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/es/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/es/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/es/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -402,8 +422,8 @@ index ------------ ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/fr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/fr/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/fr/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/fr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -452,11 +472,11 @@ index ------------ ./sdk/x.y.z/FSharp/runtimes/win/lib/ ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/ ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll +./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll +./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Drawing.Common.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll +-./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll @@ -477,8 +497,8 @@ index ------------ ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/it/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/it/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/it/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/it/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/it/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -523,8 +543,8 @@ index ------------ ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ja/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ja/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ja/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ja/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -569,8 +589,8 @@ index ------------ ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ko/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ko/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ko/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ko/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -606,8 +626,9 @@ index ------------ -./sdk/x.y.z/ko/vstest.console.resources.dll ./sdk/x.y.z/Microsoft.ApplicationInsights.dll ./sdk/x.y.z/Microsoft.AspNetCore.DeveloperCertificates.XPlat.dll ++./sdk/x.y.z/Microsoft.Bcl.AsyncInterfaces.dll ./sdk/x.y.z/Microsoft.Build.dll -@@ ------------ @@ + ./sdk/x.y.z/Microsoft.Build.Framework.dll ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll ./sdk/x.y.z/Microsoft.Build.Utilities.Core.dll @@ -622,10 +643,10 @@ index ------------ +./sdk/x.y.z/Microsoft.TestPlatform.TestHostRuntimeProvider.dll ./sdk/x.y.z/Microsoft.TestPlatform.Utilities.dll ./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll --./sdk/x.y.z/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xml ./sdk/x.y.z/Microsoft.VisualBasic.CrossTargeting.targets ./sdk/x.y.z/Microsoft.VisualBasic.CurrentVersion.targets ./sdk/x.y.z/Microsoft.VisualBasic.targets +-./sdk/x.y.z/Microsoft.VisualStudio.Setup.Configuration.Interop.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Client.dll ./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Common.dll +./sdk/x.y.z/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll @@ -646,8 +667,8 @@ index ------------ ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pl/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pl/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/pl/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/pl/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -692,8 +713,8 @@ index ------------ ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/pt-BR/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/pt-BR/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/pt-BR/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -734,13 +755,8 @@ index ------------ ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.CSharp.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.resources.dll ./sdk/x.y.z/Roslyn/bincore/ru/Microsoft.CodeAnalysis.VisualBasic.resources.dll -+./sdk/x.y.z/Roslyn/bincore/runtimes/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/ -+./sdk/x.y.z/Roslyn/bincore/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/Roslyn/bincore/System.Collections.Immutable.dll -+./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll + ./sdk/x.y.z/Roslyn/bincore/System.Reflection.Metadata.dll +./sdk/x.y.z/Roslyn/bincore/System.Text.Encoding.CodePages.dll ./sdk/x.y.z/Roslyn/bincore/tr/ ./sdk/x.y.z/Roslyn/bincore/tr/Microsoft.CodeAnalysis.CSharp.resources.dll @@ -758,8 +774,8 @@ index ------------ ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/ru/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/ru/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/ru/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/ru/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -797,32 +813,21 @@ index ------------ ./sdk/x.y.z/runtimes/ ./sdk/x.y.z/runtimes/any/ @@ ------------ @@ - ./sdk/x.y.z/runtimes/any/native/NuGet.props - ./sdk/x.y.z/runtimes/any/native/NuGet.RestoreEx.targets - ./sdk/x.y.z/runtimes/any/native/NuGet.targets --./sdk/x.y.z/runtimes/unix/ --./sdk/x.y.z/runtimes/unix/lib/ --./sdk/x.y.z/runtimes/unix/lib/netx.y/ --./sdk/x.y.z/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/runtimes/browser/ -+./sdk/x.y.z/runtimes/browser/lib/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/runtimes/win/ - ./sdk/x.y.z/runtimes/win/lib/ - ./sdk/x.y.z/runtimes/win/lib/netx.y/ --./sdk/x.y.z/runtimes/win/lib/netx.y/ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll +-./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Memory.dll --./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Numerics.Vectors.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Reflection.Metadata.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Runtime.CompilerServices.Unsafe.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll.config + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/netx.y/Microsoft.NET.Sdk.BlazorWebAssembly.Tool.deps.json @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentNoLocation.transform ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/targets/TransformTargets/Transforms/EnvironmentWithLocation.transform @@ -874,6 +879,10 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/netx.y/cs/Microsoft.NET.Sdk.Publish.Tasks.resources.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Bcl.AsyncInterfaces.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.NET.Sdk.Razor.Tasks.dll +-./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/Microsoft.NET.Sdk.Razor.Tasks.dll.config ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Collections.Immutable.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Memory.dll @@ -1373,8 +1382,8 @@ index ------------ ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/tr/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/tr/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/tr/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/tr/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -1411,11 +1420,7 @@ index ------------ ./sdk/x.y.z/trustedroots/ ./sdk/x.y.z/trustedroots/codesignctl.pem ./sdk/x.y.z/trustedroots/timestampctl.pem -+./sdk/x.y.z/vstest.console - ./sdk/x.y.z/vstest.console.deps.json - ./sdk/x.y.z/vstest.console.dll - ./sdk/x.y.z/vstest.console.dll.config --./sdk/x.y.z/vstest.console.exe +@@ ------------ @@ ./sdk/x.y.z/vstest.console.runtimeconfig.json ./sdk/x.y.z/zh-Hans/ ./sdk/x.y.z/zh-Hans/dotnet.resources.dll @@ -1428,8 +1433,8 @@ index ------------ ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hans/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/zh-Hans/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/zh-Hans/Microsoft.TestPlatform.CommunicationUtilities.resources.dll @@ -1474,8 +1479,8 @@ index ------------ ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Sln.Internal.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.DotNet.Cli.Utils.resources.dll @@ ------------ @@ - ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Edge.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.resources.dll + ./sdk/x.y.z/zh-Hant/Microsoft.TemplateEngine.Utils.resources.dll ./sdk/x.y.z/zh-Hant/Microsoft.TemplateSearch.Common.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.Build.resources.dll -./sdk/x.y.z/zh-Hant/Microsoft.TestPlatform.CommunicationUtilities.resources.dll diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt index 2866b7f1e..02d2c7cf5 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt @@ -1,620 +1,56 @@ - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - + AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - + AssemblyAttribute @@ -623,562 +59,10 @@ AssemblyAttribute - + AssemblyAttribute - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - - AssemblyAttribute - - + AssemblyAttribute \ No newline at end of file diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 03e407b2e..7ce25b785 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -53,7 +53,7 @@ namespace Microsoft.DotNet.Cli.Build foreach (var file in files) { - sb.Append(@" file source=""!(bindpath.sources)\Redist\Common\NetCoreSDK\MSBuildExtensions\"); + sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); sb.AppendLine("\""); } diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index f6c808f35..687af9365 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -70,7 +70,7 @@ 30 32 17 - 13 + 14 2