diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61bfeedb3bd0..927701998e56 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -267,30 +267,30 @@ - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 720af493900b2f2bdc48e9ee12577983a5c9be36 - + https://github.com/dotnet/arcade - 0c027eede69ba22bafca9a1955f1e00848655ece + 720af493900b2f2bdc48e9ee12577983a5c9be36 https://github.com/dotnet/runtime b23dc07bd7363fcd986a17230c2734bc656e71a7 - + https://github.com/dotnet/xliff-tasks - 47a504cdc72993370f057a11c2a39a7faa3111ad + 740189d758fb3bbdc118c5b6171ef1a7351a8c44 diff --git a/eng/Versions.props b/eng/Versions.props index dfc68d2f2e91..578b56fd0f68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.22418.4 + 7.0.0-beta.22464.4 7.0.0-preview.22423.2 7.0.0-rc.2.22469.6 4.3.0 @@ -175,7 +175,7 @@ - 1.0.0-beta.22415.3 + 1.0.0-beta.22427.1 @@ -185,7 +185,7 @@ 6.7.0 6.1.0 - 7.0.0-beta.22418.4 + 7.0.0-beta.22464.4 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/cross/arm/sources.list.focal b/eng/common/cross/arm/sources.list.focal new file mode 100644 index 000000000000..4de2600c1747 --- /dev/null +++ b/eng/common/cross/arm/sources.list.focal @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm/sources.list.jammy b/eng/common/cross/arm/sources.list.jammy new file mode 100644 index 000000000000..6bb0453029cc --- /dev/null +++ b/eng/common/cross/arm/sources.list.jammy @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.focal b/eng/common/cross/arm64/sources.list.focal new file mode 100644 index 000000000000..4de2600c1747 --- /dev/null +++ b/eng/common/cross/arm64/sources.list.focal @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/arm64/sources.list.jammy b/eng/common/cross/arm64/sources.list.jammy new file mode 100644 index 000000000000..6bb0453029cc --- /dev/null +++ b/eng/common/cross/arm64/sources.list.jammy @@ -0,0 +1,11 @@ +deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted + +deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse +deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe multiverse diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 032f5f193732..5680980fa296 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -186,32 +186,27 @@ while :; do __UbuntuArch=i386 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; - lldb3.6) - __LLDB_Package="lldb-3.6-dev" - ;; - lldb3.8) - __LLDB_Package="lldb-3.8-dev" - ;; - lldb3.9) - __LLDB_Package="liblldb-3.9-dev" - ;; - lldb4.0) - __LLDB_Package="liblldb-4.0-dev" - ;; - lldb5.0) - __LLDB_Package="liblldb-5.0-dev" - ;; - lldb6.0) - __LLDB_Package="liblldb-6.0-dev" + lldb*) + version="${lowerI/lldb/}" + parts=(${version//./ }) + + # for versions > 6.0, lldb has dropped the minor version + if [[ "${parts[0]}" -gt 6 ]]; then + version="${parts[0]}" + fi + + __LLDB_Package="liblldb-${version}-dev" ;; no-lldb) unset __LLDB_Package ;; llvm*) - version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + version="${lowerI/llvm/}" parts=(${version//./ }) __LLVM_MajorVersion="${parts[0]}" __LLVM_MinorVersion="${parts[1]}" + + # for versions > 6.0, llvm has dropped the minor version if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then __LLVM_MinorVersion=0; fi @@ -231,6 +226,16 @@ while :; do __CodeName=bionic fi ;; + focal) # Ubuntu 20.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=focal + fi + ;; + jammy) # Ubuntu 22.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=jammy + fi + ;; jessie) # Debian 8 __CodeName=jessie __UbuntuRepo="http://ftp.debian.org/debian/" diff --git a/eng/common/cross/x86/sources.list.focal b/eng/common/cross/x86/sources.list.focal new file mode 100644 index 000000000000..99d5731330e7 --- /dev/null +++ b/eng/common/cross/x86/sources.list.focal @@ -0,0 +1,11 @@ +deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse diff --git a/eng/common/cross/x86/sources.list.jammy b/eng/common/cross/x86/sources.list.jammy new file mode 100644 index 000000000000..af1c1feaeac1 --- /dev/null +++ b/eng/common/cross/x86/sources.list.jammy @@ -0,0 +1,11 @@ +deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe +deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe + +deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted +deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted + +deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse +deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 846e7950ce94..bab18543d6c4 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -62,7 +62,7 @@ $locJson = @{ $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } @@ -98,7 +98,7 @@ $locJson = @{ $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { - if ($outputPath.Contains($exclusion)) + if ($_.FullName.Contains($exclusion)) { $continue = $false } diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a682c..aaeb83b4dcbd 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 6c523b714f40..6b8fc9970808 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a622d..b6137f44ada1 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 21fd12276b65..59a42c338ab1 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -28,10 +28,10 @@ jobs: ${{ if eq(parameters.pool, '') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 64e5929f2216..297e7946b0be 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -95,7 +95,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3bfd..8dd2d355f22d 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 87fcae940cff..957375c1c1a6 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -106,7 +106,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -143,7 +143,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -203,7 +203,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -262,7 +262,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 34f6643a0d0f..01d845abfa21 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.100-preview.7.22377.5", + "dotnet": "7.0.100-rc.1.22431.12", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22418.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22418.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22464.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22464.4" } } diff --git a/src/RazorSdk/update-test-baselines.ps1 b/src/RazorSdk/update-test-baselines.ps1 new file mode 100644 index 000000000000..38c7e9553632 --- /dev/null +++ b/src/RazorSdk/update-test-baselines.ps1 @@ -0,0 +1,6 @@ +$RepoRoot= Resolve-Path "$PSScriptRoot/../.." + +$TestProjects = "Microsoft.NET.Sdk.Razor.Tests", "Microsoft.NET.Sdk.BlazorWebAssembly.Tests" | + ForEach-Object { Join-Path -Path "$RepoRoot/src/Tests/" -ChildPath $_ }; + +$TestProjects | ForEach-Object { dotnet test --no-build -l "console;verbosity=normal" $_ -e ASPNETCORE_TEST_BASELINES=true --filter AspNetCore=BaselineTest } diff --git a/src/Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs b/src/Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs index 5db15105974f..a722d5301a73 100644 --- a/src/Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs +++ b/src/Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests/StartupHookTests.cs @@ -25,7 +25,7 @@ public void ClearHotReloadEnvironmentVariables_ClearsStartupHook() (name, value) => environmentVariables[name] = value); // Assert - Assert.Empty(environmentVariables["DOTNET_STARTUP_HOOKS"]); + Assert.True(string.IsNullOrEmpty(environmentVariables["DOTNET_STARTUP_HOOKS"])); } [Fact] diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json index 7906564fb8eb..5cd05af188ff 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json @@ -92,9 +92,9 @@ "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js", "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.br", "${OutputPath}\\wwwroot\\_framework\\blazor.webassembly.js.gz", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js.br", - "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js.gz", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.br", + "${OutputPath}\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js.gz", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.timezones.blat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json index ef24746cf0fb..f73f86ac25f2 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json @@ -46,12 +46,12 @@ "OriginalItemSpec": "${RestorePath}\\microsoft.aspnetcore.components.webassembly\\[[CustomPackageVersion]]\\build\\net6.0\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js", + "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.7.[[hash]].js", + "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Primary", @@ -60,7 +60,7 @@ "AssetTraitValue": "native", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js" }, { "Identity": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.timezones.blat", @@ -233,21 +233,21 @@ "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.7.[[hash]].js.gz]]", + "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.7.[[hash]].js.gz", + "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.gz", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "gzip", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.7.[[hash]].js.gz]]" + "OriginalItemSpec": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.6.0.9.[[hash]].js.gz]]" }, { "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\build-gz\\[[_framework/dotnet.wasm.gz]]", @@ -1270,21 +1270,21 @@ "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\blazor.webassembly.js" }, { - "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.7.[[hash]].js.br]]", + "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.6.0.9.[[hash]].js.br]]", "SourceId": "BlazorWasmHosted60.Client", "SourceType": "Project", "ContentRoot": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\publish\\wwwroot\\", "BasePath": "/", - "RelativePath": "_framework/dotnet.6.0.7.[[hash]].js.br", + "RelativePath": "_framework/dotnet.6.0.9.[[hash]].js.br", "AssetKind": "Publish", "AssetMode": "All", "AssetRole": "Alternative", - "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js", + "RelatedAsset": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js", "AssetTraitName": "Content-Encoding", "AssetTraitValue": "br", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.7.[[hash]].js" + "OriginalItemSpec": "${ProjectRoot}\\Client\\bin\\Debug\\net6.0\\wwwroot\\_framework\\dotnet.6.0.9.[[hash]].js" }, { "Identity": "${ProjectRoot}\\Client\\obj\\Debug\\net6.0\\compress\\[[_framework/dotnet.timezones.blat.br]]", diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/HostDataLoaderTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/HostDataLoaderTests.cs index 16953d090ee4..46fcdc639b95 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/HostDataLoaderTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/HostDataLoaderTests.cs @@ -40,6 +40,7 @@ public void CanLoadHostDataFile() Assert.False(data.IsHidden); Assert.Equal(2, data.UsageExamples?.Count); + Assert.NotNull(data.UsageExamples); Assert.Contains("--framework netcoreapp3.1 --langVersion '9.0'", data.UsageExamples); Assert.Equal(4, data.SymbolInfo?.Count); Assert.Contains("TargetFrameworkOverride", data.HiddenParameterNames); @@ -83,6 +84,7 @@ public void CanReadHostDataFromITemplateInfo() Assert.False(data.IsHidden); Assert.Equal(2, data.UsageExamples?.Count); + Assert.NotNull(data.UsageExamples); Assert.Contains("--framework netcoreapp3.1 --langVersion '9.0'", data.UsageExamples); Assert.Equal(4, data.SymbolInfo?.Count); Assert.Contains("TargetFrameworkOverride", data.HiddenParameterNames); diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs index 708871f55367..1a8f333fe02c 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs @@ -21,6 +21,7 @@ public void Install_CanParseAddSourceOption(string optionName) ParseResult parseResult = myCommand.Parse($"new install source {optionName} my-custom-source"); InstallCommandArgs args = new((InstallCommand)parseResult.CommandResult.Command, parseResult); + Assert.NotNull(args.AdditionalSources); Assert.Single(args.AdditionalSources); Assert.Contains("my-custom-source", args.AdditionalSources); Assert.Single(args.TemplatePackages); @@ -65,7 +66,8 @@ public void Install_CanParseAddSourceOption_MultipleEntries(string testCase) ParseResult parseResult = myCommand.Parse(testCase); InstallCommandArgs args = new((InstallCommand)parseResult.CommandResult.Command, parseResult); - Assert.Equal(2, args.AdditionalSources?.Count); + Assert.NotNull(args.AdditionalSources); + Assert.Equal(2, args.AdditionalSources.Count); Assert.Contains("my-custom-source1", args.AdditionalSources); Assert.Contains("my-custom-source2", args.AdditionalSources); Assert.Single(args.TemplatePackages); @@ -140,6 +142,7 @@ public void Install_Legacy_CanParseAddSourceOption(string testCase) ParseResult parseResult = myCommand.Parse(testCase); InstallCommandArgs args = new((LegacyInstallCommand)parseResult.CommandResult.Command, parseResult); + Assert.NotNull(args.AdditionalSources); Assert.Single(args.AdditionalSources); Assert.Contains("my-custom-source", args.AdditionalSources); Assert.Single(args.TemplatePackages); @@ -189,7 +192,8 @@ public void Install_Legacy_CanParseAddSourceOption_MultipleEntries(string testCa ParseResult parseResult = myCommand.Parse(testCase); InstallCommandArgs args = new((LegacyInstallCommand)parseResult.CommandResult.Command, parseResult); - Assert.Equal(2, args.AdditionalSources?.Count); + Assert.NotNull(args.AdditionalSources); + Assert.Equal(2, args.AdditionalSources.Count); Assert.Contains("my-custom-source1", args.AdditionalSources); Assert.Contains("my-custom-source2", args.AdditionalSources); Assert.Single(args.TemplatePackages); diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs index 94a88f0f031e..56d85431e779 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/ListTests.cs @@ -220,8 +220,9 @@ public void List_CanParseColumns(string command, string[] expectedColumns) ListCommandArgs args = new((BaseListCommand)parseResult.CommandResult.Command, parseResult); Assert.False(args.DisplayAllColumns); + Assert.NotNull(args.ColumnsToDisplay); Assert.NotEmpty(args.ColumnsToDisplay); - Assert.Equal(expectedColumns.Length, args.ColumnsToDisplay?.Count); + Assert.Equal(expectedColumns.Length, args.ColumnsToDisplay.Count); foreach (string column in expectedColumns) { Assert.Contains(column, args.ColumnsToDisplay); diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs index 50c2b7e60feb..e36ef67f2341 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/SearchTests.cs @@ -217,9 +217,10 @@ public void Search_CanParseColumns(string command, string[] expectedColumns) SearchCommandArgs args = new((BaseSearchCommand)parseResult.CommandResult.Command, parseResult); + Assert.NotNull(args.ColumnsToDisplay); Assert.False(args.DisplayAllColumns); Assert.NotEmpty(args.ColumnsToDisplay); - Assert.Equal(expectedColumns.Length, args.ColumnsToDisplay?.Count); + Assert.Equal(expectedColumns.Length, args.ColumnsToDisplay.Count); foreach (string column in expectedColumns) { Assert.Contains(column, args.ColumnsToDisplay); diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs index 244d34184cc9..b7d8d406f885 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/UpdateTests.cs @@ -21,6 +21,7 @@ public void Update_CanParseAddSourceOption(string optionName) ParseResult parseResult = myCommand.Parse($"new update {optionName} my-custom-source"); UpdateCommandArgs args = new((UpdateCommand)parseResult.CommandResult.Command, parseResult); + Assert.NotNull(args.AdditionalSources); Assert.Single(args.AdditionalSources); Assert.Contains("my-custom-source", args.AdditionalSources); } @@ -50,7 +51,8 @@ public void Update_CanParseAddSourceOption_MultipleEntries(string testCase) ParseResult parseResult = myCommand.Parse(testCase); UpdateCommandArgs args = new((UpdateCommand)parseResult.CommandResult.Command, parseResult); - Assert.Equal(2, args.AdditionalSources?.Count); + Assert.NotNull(args.AdditionalSources); + Assert.Equal(2, args.AdditionalSources.Count); Assert.Contains("my-custom-source1", args.AdditionalSources); Assert.Contains("my-custom-source2", args.AdditionalSources); } @@ -120,6 +122,7 @@ public void Update_Legacy_CanParseAddSourceOption(string testCase) ParseResult parseResult = myCommand.Parse(testCase); UpdateCommandArgs args = new((BaseUpdateCommand)parseResult.CommandResult.Command, parseResult); + Assert.NotNull(args.AdditionalSources); Assert.Single(args.AdditionalSources); Assert.Contains("my-custom-source", args.AdditionalSources); } @@ -149,7 +152,8 @@ public void Update_Legacy_CanParseAddSourceOption_MultipleEntries(string testCas ParseResult parseResult = myCommand.Parse(testCase); UpdateCommandArgs args = new((BaseUpdateCommand)parseResult.CommandResult.Command, parseResult); - Assert.Equal(2, args.AdditionalSources?.Count); + Assert.NotNull(args.AdditionalSources); + Assert.Equal(2, args.AdditionalSources.Count); Assert.Contains("my-custom-source1", args.AdditionalSources); Assert.Contains("my-custom-source2", args.AdditionalSources); } diff --git a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs index a360eedf7611..2d407d63d2bf 100644 --- a/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs +++ b/src/Tests/dotnet.Tests/dotnet-new/DotnetSlnPostActionTests.cs @@ -77,11 +77,12 @@ public void AddProjectToSolutionPostActionFindsMultipleProjectsToAdd() }); Assert.True(DotnetSlnPostActionProcessor.TryGetProjectFilesToAdd( postAction, creationResult, outputBasePath, out IReadOnlyList? foundProjectFiles)); - Assert.Equal(2, foundProjectFiles?.Count); - Assert.Contains(creationResult.PrimaryOutputs[0].Path, foundProjectFiles?.ToList()); - Assert.Contains(creationResult.PrimaryOutputs[2].Path, foundProjectFiles?.ToList()); + Assert.NotNull(foundProjectFiles); + Assert.Equal(2, foundProjectFiles.Count); + Assert.Contains(creationResult.PrimaryOutputs[0].Path, foundProjectFiles.ToList()); + Assert.Contains(creationResult.PrimaryOutputs[2].Path, foundProjectFiles.ToList()); - Assert.DoesNotContain(creationResult.PrimaryOutputs[1].Path, foundProjectFiles?.ToList()); + Assert.DoesNotContain(creationResult.PrimaryOutputs[1].Path, foundProjectFiles.ToList()); } [Fact(DisplayName = nameof(AddProjectToSolutionPostActionDoesntFindProjectOutOfRange))] @@ -128,11 +129,12 @@ public void AddProjectToSolutionPostActionFindsMultipleProjectsToAddWithOutputBa string outputFileFullPath2 = Path.Combine(outputBasePath, creationResult.PrimaryOutputs[2].Path); Assert.True(DotnetSlnPostActionProcessor.TryGetProjectFilesToAdd( postAction, creationResult, outputBasePath, out IReadOnlyList? foundProjectFiles)); - Assert.Equal(2, foundProjectFiles?.Count); - Assert.Contains(outputFileFullPath0, foundProjectFiles?.ToList()); - Assert.Contains(outputFileFullPath2, foundProjectFiles?.ToList()); + Assert.NotNull(foundProjectFiles); + Assert.Equal(2, foundProjectFiles.Count); + Assert.Contains(outputFileFullPath0, foundProjectFiles.ToList()); + Assert.Contains(outputFileFullPath2, foundProjectFiles.ToList()); - Assert.DoesNotContain(dontFindMeFullPath1, foundProjectFiles?.ToList()); + Assert.DoesNotContain(dontFindMeFullPath1, foundProjectFiles.ToList()); } [Fact(DisplayName = nameof(AddProjectToSolutionPostActionWithoutPrimaryOutputIndexesWithOutputBasePath))] @@ -156,9 +158,10 @@ public void AddProjectToSolutionPostActionWithoutPrimaryOutputIndexesWithOutputB string outputFileFullPath1 = Path.Combine(outputBasePath, creationResult.PrimaryOutputs[1].Path); Assert.True(DotnetSlnPostActionProcessor.TryGetProjectFilesToAdd( postAction, creationResult, outputBasePath, out IReadOnlyList? foundProjectFiles)); - Assert.Equal(2, foundProjectFiles?.Count); - Assert.Contains(outputFileFullPath0, foundProjectFiles?.ToList()); - Assert.Contains(outputFileFullPath1, foundProjectFiles?.ToList()); + Assert.NotNull(foundProjectFiles); + Assert.Equal(2, foundProjectFiles.Count); + Assert.Contains(outputFileFullPath0, foundProjectFiles.ToList()); + Assert.Contains(outputFileFullPath1, foundProjectFiles.ToList()); } [Fact(DisplayName = nameof(AddProjectToSolutionCanTargetASingleProjectWithAJsonArray))]