diff --git a/global.json b/global.json index 7dc4e1b46f1a..dee19df73dff 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.100-preview.2.20120.3" + "version": "5.0.100-preview.5.20251.2" }, "tools": { - "dotnet": "5.0.100-preview.2.20120.3", + "dotnet": "5.0.100-preview.5.20251.2", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" diff --git a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj index 5e95e71c89f5..62a1e9eece79 100644 --- a/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj +++ b/src/Mvc/Mvc.Razor.RuntimeCompilation/src/Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation.csproj @@ -1,9 +1,12 @@  - Runtime compilation support for Razor views and Razor Pages in ASP.NET Core MVC. $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 + + + $(NoWarn);NU5129 + true aspnetcore;aspnetcoremvc;razor true diff --git a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj index 412ba505cf83..1df08431756a 100644 --- a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj +++ b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.csproj @@ -1,9 +1,12 @@  - Support for writing functional tests for MVC applications. $(DefaultNetCoreTargetFramework) $(NoWarn);CS1591 + + + $(NoWarn);NU5129 + true aspnetcore;aspnetcoremvc;aspnetcoremvctesting true @@ -21,5 +24,4 @@ - diff --git a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets index 452fc9909d8f..8e9f7093e19c 100644 --- a/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets +++ b/src/Mvc/Mvc.Testing/src/Microsoft.AspNetCore.Mvc.Testing.targets @@ -23,7 +23,7 @@ - + - <_Parameter1>%(WebApplicationFactoryContentRootAttribute.AssemblyName) @@ -55,5 +55,5 @@ - + \ No newline at end of file diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj index 3118aac607e7..9d082de74f6e 100644 --- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj +++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj @@ -69,7 +69,7 @@ - + $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) $(TestTemplateCreationFolder)$(TestTemplateTestsProps) diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj index e54b80fa4cd5..f9d8b8db4cbc 100644 --- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj +++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj @@ -72,7 +72,7 @@ - + $([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)')) $(TestTemplateCreationFolder)$(TestTemplateTestsProps) diff --git a/src/Servers/IIS/build/testsite.props b/src/Servers/IIS/build/testsite.props index 4ff733d3871d..aacd1d8b27e5 100644 --- a/src/Servers/IIS/build/testsite.props +++ b/src/Servers/IIS/build/testsite.props @@ -59,17 +59,27 @@ + + BeforeTargets="BuildDepsJson;CoreBuild" + DependsOnTargets="GenerateBuildDependencyFile;PrepareInjectionApp"> + + BeforeTargets="Publish" + DependsOnTargets="GeneratePublishDependencyFile;CopyFilesToPublishDirectory;PrepareInjectionApp"> diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets index f3e73276b087..5726735dfbf5 100644 --- a/src/Shared/E2ETesting/E2ETesting.targets +++ b/src/Shared/E2ETesting/E2ETesting.targets @@ -77,7 +77,7 @@ - + <_ContentRootMetadata Condition="'%(_ContentRootProjectReferences.Identity)' != ''" @@ -98,7 +98,7 @@ - + <_SeleniumE2ETestsSupportedAttributeValue>false <_SeleniumE2ETestsSupportedAttributeValue Condition="'$(SeleniumE2ETestsSupported)' == 'true'">true @@ -118,7 +118,7 @@ - +