diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ed9459f5c5c78..eba66a961335c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness cf1b2925785f504d4d52773bcab470044e35ea15 - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + 5b1e2d133be215e729cf90016ae12b520950ce7a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -402,9 +402,9 @@ d3972005ce081b597a9dab72761d281e57acdc5a - + https://github.com/dotnet/sdk - c0f88f2416d2e61f302411bdfbab3b2e87b9d35c + c921fd0a32c3e6001b10791dd0a30f8ef80f915f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 656d5db29d225a..f182f5f8bcac58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,24 +83,24 @@ 0.2.0 - 10.0.100-preview.2.25108.4 + 10.0.100-preview.3.25126.5 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 2.9.2-beta.25113.2 - 10.0.0-beta.25113.2 - 2.9.2-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 - 10.0.0-beta.25113.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 2.9.2-beta.25125.2 + 10.0.0-beta.25125.2 + 2.9.2-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 + 10.0.0-beta.25125.2 1.4.0 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e3196727..c7d59dcbfe1566 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -76,12 +76,11 @@ jobs: fetchDepth: 3 clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download artifact + - task: DownloadPipelineArtifact@2 + displayName: Download Asset Manifests inputs: artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true + targetPath: '$(Build.StagingDirectory)/AssetManifests' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -95,7 +94,7 @@ jobs: scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index d938b60e1bb534..b8e6dea83c2886 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 9.0.0 + PackageVersion: 10.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4f0546dce1208d..ab2b13f63fb2ba 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 80f9130b15087c..95ccdf82e4bbca 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 - $defaultXCopyMSBuildVersion = '17.12.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 + $defaultXCopyMSBuildVersion = '17.13.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 281ab3c33e0b6c..a4eda61b432598 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "10.0.100-alpha.1.25077.2", + "version": "10.0.100-preview.3.25125.5", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-alpha.1.25077.2" + "dotnet": "10.0.100-preview.3.25125.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25113.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25125.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25125.2", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25125.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-alpha.1.25068.1" diff --git a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj index 49ccc41646dfc1..247a015b3940d5 100644 --- a/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj +++ b/src/installer/tests/Microsoft.DotNet.CoreSetup.Packaging.Tests/Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj @@ -32,6 +32,4 @@ BuildInParallel="$(BuildInParallel)" /> - - diff --git a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj index 8aabb459526220..a9dab8c3709fe0 100644 --- a/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.DependencyInjection/tests/DI.External.Tests/Microsoft.Extensions.DependencyInjection.ExternalContainers.Tests.csproj @@ -4,9 +4,6 @@ $(NetCoreAppCurrent);$(NetFrameworkMinimum) true $(NoWarn);CS8002 - - - false @@ -23,17 +20,11 @@ - - - - diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj index a4ba910907f02c..477019528c0264 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn3.11.Tests.csproj @@ -3,8 +3,6 @@ $(MicrosoftCodeAnalysisVersion_3_11) true - - false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj index 6f2b057c80d261..2f4cb04d421a7f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.0.Tests.csproj @@ -5,8 +5,6 @@ $(DefineConstants);ROSLYN4_0_OR_GREATER true -O1 - - false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.8.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.8.Tests.csproj index e480e542b15444..1bb07c89807822 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.8.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Roslyn4.8.Tests.csproj @@ -5,8 +5,6 @@ $(DefineConstants);ROSLYN4_0_OR_GREATER;ROSLYN4_8_OR_GREATER true -O1 - - false diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets index 115a93167b3892..dfc5b8e9ad7856 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.targets @@ -19,11 +19,6 @@ - - - - - diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj index 6c3acbcaeb4f43..7d7c040d33111c 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/tests/Microsoft.Extensions.Logging.Console.Tests/Microsoft.Extensions.Logging.Console.Tests.csproj @@ -10,6 +10,10 @@ + + + + diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index 2f10f4d0574c30..419f2d96deafca 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -1,7 +1,8 @@ + - $(DefineConstants);XMLSERIALIZERGENERATORTESTS $(NetCoreAppCurrent) + $(DefineConstants);XMLSERIALIZERGENERATORTESTS true diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/SerializableAssembly.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/SerializableAssembly.csproj index ab08ca5fa8ffe5..ee6512e4a6a7bb 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/SerializableAssembly.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/SerializableAssembly.csproj @@ -1,16 +1,13 @@ + - netstandard2.1 + $(NetCoreAppCurrent) - - - - diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index 3f734f107c98b9..3d80be9e7906be 100644 --- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -1,14 +1,19 @@ + - $(NoWarn);0436 $(NetCoreAppCurrent);$(NetFrameworkMinimum) + $(NoWarn);0436 true true + + $(NoWarn);NU1511 + @@ -71,9 +76,12 @@ - + + + + @@ -91,12 +99,10 @@ - - - - + + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 4b9d949f96b4f3..fe68c58eef9155 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -1,18 +1,19 @@ + - true $(NetCoreAppCurrent);$(NetFrameworkCurrent) + true + + $(DefineConstants);MEMORYMARSHAL_SUPPORT + - - - - + @@ -39,19 +40,24 @@ + + + + + + + - - - + - - - + + + \ No newline at end of file diff --git a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj index 19851efa3ec0a9..d41bfd533ed850 100644 --- a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj +++ b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj @@ -1,8 +1,13 @@ + - true $(NetCoreAppCurrent);$(NetFrameworkMinimum) + true + + $(NoWarn);NU1511 + @@ -46,6 +51,7 @@ + @@ -54,14 +60,18 @@ + + + + \ No newline at end of file diff --git a/src/libraries/System.Linq.AsyncEnumerable/tests/System.Linq.AsyncEnumerable.Tests.csproj b/src/libraries/System.Linq.AsyncEnumerable/tests/System.Linq.AsyncEnumerable.Tests.csproj index 164e0e77aa690c..4b045a52e3dab3 100644 --- a/src/libraries/System.Linq.AsyncEnumerable/tests/System.Linq.AsyncEnumerable.Tests.csproj +++ b/src/libraries/System.Linq.AsyncEnumerable/tests/System.Linq.AsyncEnumerable.Tests.csproj @@ -1,8 +1,10 @@  + $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(NoWarn);CS1998 + @@ -72,12 +74,12 @@ - + + - - + diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 7f914dfaacb3bc..44e576ea14ae89 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -1,4 +1,5 @@ + @@ -240,21 +241,25 @@ + + + + @@ -271,6 +276,7 @@ + @@ -312,6 +318,7 @@ + + SelectedSitesTest.txt + - - - + diff --git a/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj b/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj index 526ad7319b7969..594def676a1ad0 100644 --- a/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj +++ b/src/libraries/System.Private.CoreLib/tests/IntrinsicsInSystemPrivatecoreLibAnalyzer.Tests/IntrinsicsInSystemPrivateCoreLib.Tests.csproj @@ -10,13 +10,6 @@ - - - - - - - diff --git a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj index b19efe835a74aa..1ce5192ef4ad2d 100644 --- a/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/System.Private.Xml.Tests.csproj @@ -1,7 +1,8 @@ + - System.Xml.Tests $(NetCoreAppCurrent) + System.Xml.Tests diff --git a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj index f92aaea6308756..598d0516beb0f4 100644 --- a/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj +++ b/src/libraries/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.csproj @@ -1,9 +1,11 @@ + $(NetCoreAppCurrent) true true + @@ -130,8 +132,9 @@ + - + diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index e952494537be86..bb61c7204c8571 100644 --- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -1,13 +1,16 @@ + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true false $(NoWarn);436;SYSLIB0037 - $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(DefineConstants);TARGET_BROWSER + + $(NoWarn);NU1511 @@ -25,8 +28,8 @@ Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" /> - + @@ -148,10 +151,11 @@ - + + + $(NetCoreAppCurrent) enable true true + @@ -13,6 +15,7 @@ + @@ -20,14 +23,7 @@ - - - - - - - - + diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JavaScriptLibrary/JavaScriptLibrary.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JavaScriptLibrary/JavaScriptLibrary.csproj index 9d1b9c04271991..5d46e8e5fef624 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JavaScriptLibrary/JavaScriptLibrary.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/JavaScriptLibrary/JavaScriptLibrary.csproj @@ -1,19 +1,30 @@ + - $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) - true $(NetCoreAppCurrent)-browser + true true + + $(NoWarn);NU1511 + true false + + + + + + + @@ -23,4 +34,5 @@ + diff --git a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj index 70b12693650def..846442cca6ca1c 100644 --- a/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices.JavaScript/tests/System.Runtime.InteropServices.JavaScript.UnitTests/System.Runtime.InteropServices.JavaScript.Tests.csproj @@ -17,6 +17,9 @@ true $(NoWarn);IL2103;IL2025;IL2111;IL2122 true + + $(NoWarn);NU1511 diff --git a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj index c2d8e9ef2cb3be..c612c394035dbd 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/ComInterfaceGenerator.Unit.Tests/ComInterfaceGenerator.Unit.Tests.csproj @@ -27,14 +27,6 @@ - - - - - - - - diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj index ac398b9cce9f36..f442060dc184b0 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/LibraryImportGenerator.Unit.Tests.csproj @@ -31,14 +31,6 @@ - - - - - - - - diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj index d128172dd2acc6..fa41e930519884 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/ReflectionOnly/System.Runtime.Serialization.Xml.ReflectionOnly.Tests.csproj @@ -1,12 +1,10 @@ + - $(DefineConstants);ReflectionOnly $(NetCoreAppCurrent) + $(DefineConstants);ReflectionOnly - - - - + @@ -50,9 +48,16 @@ Link="SerializationTestTypes\SelfRefAndCycles.cs" /> + + + + + + + diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj index c299e17295d0a0..7f40960460a9fe 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.csproj @@ -1,11 +1,9 @@ + $(NetCoreAppCurrent) - - - - + @@ -53,9 +51,16 @@ + + + + + + - + + diff --git a/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj index 697bc05b2da20b..1347b584e428f9 100644 --- a/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj +++ b/src/libraries/System.Runtime/tests/System.Text.Encoding.Tests/System.Text.Encoding.Tests.csproj @@ -1,13 +1,15 @@ + + $(NetCoreAppCurrent) true true true - $(NetCoreAppCurrent) $(NoWarn),SYSLIB0001 true + @@ -92,11 +94,13 @@ + + - + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Tests.targets b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Tests.targets index 17f03cf208cc08..a18436db4388c9 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Tests.targets +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Tests.targets @@ -17,7 +17,10 @@ $(NoWarn);SYSLIB0020;SYSLIB0049;SYSLIB1030;SYSLIB1034;SYSLIB1037;SYSLIB1038;SYSLIB1039;SYSLIB1220;SYSLIB1222;SYSLIB1223;SYSLIB1225 - true + true + + $(NoWarn);NU1511 diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Unit.Tests.targets b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Unit.Tests.targets index 96e0f7a5885ec7..ff591bb4136401 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Unit.Tests.targets +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Unit.Tests.targets @@ -7,13 +7,7 @@ - - - - - - @@ -25,6 +19,10 @@ + + + + diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj index 85cc1a9a57294c..9225d8944bd2df 100644 --- a/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj +++ b/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj @@ -1,4 +1,5 @@ + $(NetCoreAppCurrent);$(NetFrameworkMinimum) true @@ -20,11 +21,13 @@ Enable reflection and preserve required assemblies --> true - $(Features.Replace('nullablePublicOnly', '') + $(Features.Replace('nullablePublicOnly', '')) + 1 + @@ -266,18 +269,17 @@ - - - - - - + + + + + @@ -286,4 +288,5 @@ + diff --git a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj index e84848318f7060..f57cd73cf2d26a 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj @@ -1,11 +1,12 @@ + + $(NetCoreAppCurrent);$(NetFrameworkCurrent) true $(NoWarn);xUnit2008;SYSLIB0036;SYSLIB1045 - $(NetCoreAppCurrent);$(NetFrameworkCurrent) true true true @@ -13,6 +14,7 @@ true + @@ -39,14 +41,17 @@ + + + @@ -76,14 +81,6 @@ - - - - - - - - + + + diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs index 56364a1a09c390..e9335ea19424f8 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs +++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs @@ -61,8 +61,6 @@ public void DefaultTemplate_AOT_WithWorkload(Configuration config, bool testUnic [Theory] [InlineData(Configuration.Debug, false)] [InlineData(Configuration.Release, false)] - [InlineData(Configuration.Debug, true)] - [InlineData(Configuration.Release, true)] public void DefaultTemplate_CheckFingerprinting(Configuration config, bool expectFingerprintOnDotnetJs) { var extraProperty = expectFingerprintOnDotnetJs ? diff --git a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj index 5897710687e5f8..498dc2dc54bc72 100644 --- a/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj +++ b/src/mono/wasm/Wasm.Build.Tests/Wasm.Build.Tests.csproj @@ -48,8 +48,6 @@ - - diff --git a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj index 47a4fe47d0f09b..8323dd02f82afd 100644 --- a/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj +++ b/src/tools/illink/test/ILLink.RoslynAnalyzer.Tests/ILLink.RoslynAnalyzer.Tests.csproj @@ -22,13 +22,6 @@ - - - - - - -