diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index ed26146de067..9aeeae442145 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -397,6 +397,23 @@ jobs: - script: cp "$(sourcesPath)/src/sdk/NuGet.config" "$(sourcesPath)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config" displayName: Copy Test NuGet Config for Smoke Tests + - ${{ else }}: + - task: Bash@3 + displayName: Add aspnetcore public feed for smoke tests + inputs: + targetType: inline + script: | + set -euo pipefail + + ONLINE_CONFIG="$(sourcesPath)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config" + FEED_KEY="darc-pub-dotnet-aspnetcore-3c5c32a7" + FEED_URL="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3c5c32a7/nuget/v3/index.json" + + # Add only if missing. Do not touch disabledPackageSources. + if ! grep -qi "| \n |" "$ONLINE_CONFIG" + fi + - script: | set -ex diff --git a/eng/pipelines/vmr-build-pr.yml b/eng/pipelines/vmr-build-pr.yml index 6d73c7ff6944..489190a8cddd 100644 --- a/eng/pipelines/vmr-build-pr.yml +++ b/eng/pipelines/vmr-build-pr.yml @@ -50,7 +50,7 @@ resources: - repository: vmr type: github name: dotnet/dotnet - endpoint: dotnet + endpoint: public ref: ${{ variables.VmrBranch }} stages: diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 0d713ed76339..ba89a4c9d426 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - e1240639569fad610705b52713d6d6b19f8fe433 + f843e65cdfc9e9af05d987f2f7f2e6f6a6106eb5 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 1705ce9fad61..6803c90109ef 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.117 - 9.0.117-servicing.26230.1 + 9.0.118 + 9.0.118-servicing.26277.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 39645861c494..38a6ea45a584 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.117" + "dotnet": "9.0.118" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26201.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26220.3" } } diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 00c3a53467d7..661fdef3a64d 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -138,6 +138,7 @@ "src/application-insights/**/*.dll", "src/application-insights/**/*.zip", "src/application-insights/**/NuGet.config", + "src/azure-activedirectory-identitymodel-extensions-for-dotnet/docs/*.docx", "src/humanizer/samples/**/*.js", "src/newtonsoft-json/**/NuGet.Config", "src/spectre-console/docs/**", diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs index 127aaf3882cd..12c0f9ce4f56 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopLibrary.cs @@ -234,6 +234,8 @@ public void It_resolves_assembly_conflicts_with_a_NETFramework_library() TargetFrameworks = "net462", }; + project.AdditionalProperties["NuGetAudit"] = "false"; + project.SourceFiles[project.Name + ".cs"] = $@" using System; public static class {project.Name} diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs index d20fb4f271d2..28686145f481 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToControlGeneratedAssemblyInfo.cs @@ -823,6 +823,7 @@ public void CheckTargetFrameworkDisplayName(string targetFrameworkVersion, strin TargetFrameworks = targetFrameworkVersion }; libraryProject.AdditionalProperties["NoWarn"] = "NETSDK1138"; + libraryProject.AdditionalProperties["NuGetAudit"] = "false"; libraryProject.SourceFiles["Class.cs"] = @" public class LibraryClass{} "; @@ -833,6 +834,7 @@ public class LibraryClass{} TargetFrameworks = ToolsetInfo.CurrentTargetFramework, IsExe = true }; + testProject.AdditionalProperties["NuGetAudit"] = "false"; testProject.ReferencedProjects.Add(libraryProject); testProject.SourceFiles["Program.cs"] = @"