Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Runtime compilation support for Razor views and Razor Pages in ASP.NET Core MVC.</Description>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>

<!-- !!! Temporary workaround while we switch TFMs. -->
<NoWarn>$(NoWarn);NU5129</NoWarn>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;razor</PackageTags>
<IsPackable>true</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Support for writing functional tests for MVC applications.</Description>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn>

<!-- !!! Temporary workaround while we switch TFMs. -->
<NoWarn>$(NoWarn);NU5129</NoWarn>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc;aspnetcoremvctesting</PackageTags>
<IsPackable>true</IsPackable>
Expand All @@ -21,5 +24,4 @@
<ItemGroup>
<Content Include="Microsoft.AspNetCore.Mvc.Testing.targets" Pack="true" PackagePath="build/$(TargetFramework)/" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>
</Target>

<Target Name="_AddContentRootForProjectReferences" BeforeTargets="BeforeCompile" DependsOnTargets="_ResolveMvcTestProjectReferences">
<Target Name="_AddContentRootForProjectReferences" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="_ResolveMvcTestProjectReferences">
<ItemGroup>
<WebApplicationFactoryContentRootAttribute
Condition="'%(_ContentRootProjectReferences.Identity)' != ''"
Expand All @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<AssemblyAttribute
<AssemblyAttribute
Condition=" '%(WebApplicationFactoryContentRootAttribute.Identity)' != '' "
Include="Microsoft.AspNetCore.Mvc.Testing.WebApplicationFactoryContentRootAttribute">
<_Parameter1>%(WebApplicationFactoryContentRootAttribute.AssemblyName)</_Parameter1>
Expand All @@ -55,5 +55,5 @@

<Copy SourceFiles="%(DepsFilePaths.FullPath)" DestinationFolder="$(OutDir)" Condition="Exists('%(DepsFilePaths.FullPath)')" />
</Target>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</AssemblyAttribute>
</ItemGroup>

<Target Name="PrepareForTest" BeforeTargets="CoreCompile" Condition="$(DesignTimeBuild) != true">
<Target Name="PrepareForTest" BeforeTargets="GetAssemblyAttributes" Condition="$(DesignTimeBuild) != true">
<PropertyGroup>
<TestTemplateCreationFolder>$([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)'))</TestTemplateCreationFolder>
<TestTemplateTestsProps>$(TestTemplateCreationFolder)$(TestTemplateTestsProps)</TestTemplateTestsProps>
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
</AssemblyAttribute>
</ItemGroup>

<Target Name="PrepareForTest" BeforeTargets="CoreCompile" Condition="$(DesignTimeBuild) != true">
<Target Name="PrepareForTest" BeforeTargets="GetAssemblyAttributes" Condition="$(DesignTimeBuild) != true">
<PropertyGroup>
<TestTemplateCreationFolder>$([MSBuild]::NormalizePath('$(OutputPath)$(TestTemplateCreationFolder)'))</TestTemplateCreationFolder>
<TestTemplateTestsProps>$(TestTemplateCreationFolder)$(TestTemplateTestsProps)</TestTemplateTestsProps>
Expand Down
18 changes: 14 additions & 4 deletions src/Servers/IIS/build/testsite.props
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,27 @@
</PropertyGroup>
</Target>

<!--
GenerateBuildDependencyFile creates the .deps file used here. BuildDepsJson and CoreBuild are empty targets marking
the end of processes using the GenerateBuildDependencyFile target.
-->
<Target Name="InjectRequestHandler"
Condition=" '$(InProcessTestSite)' == 'true' AND '$(BuildIisNativeProjects)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETFramework'"
AfterTargets="GenerateBuildDependencyFile"
DependsOnTargets="PrepareInjectionApp">
BeforeTargets="BuildDepsJson;CoreBuild"
DependsOnTargets="GenerateBuildDependencyFile;PrepareInjectionApp">
<Exec Command="$(InjectDepsApp) &quot;$(ProjectDepsFilePath)&quot; $(RuntimeIdentifier) " />
</Target>

<!--
GeneratePublishDependencyFile creates an intermediate .deps file copied soon after into the publish folder.
CopyFilesToPublishDirectory is an empty target marking the end of all copies into the publish folder, including the
.deps file and native assets. Publish is an empty target marking the end of the entire process.
(GenerateSingleFileBundle also uses the intermediate .desp file but only in single-file publish cases ignored here.)
-->
<Target Name="InjectRequestHandlerOnPublish"
Condition=" '$(InProcessTestSite)' == 'true' AND '$(BuildIisNativeProjects)' == 'true' AND '$(TargetFrameworkIdentifier)' != '.NETFramework'"
AfterTargets="GeneratePublishDependencyFile"
DependsOnTargets="PrepareInjectionApp">
BeforeTargets="Publish"
DependsOnTargets="GeneratePublishDependencyFile;CopyFilesToPublishDirectory;PrepareInjectionApp">
<Exec Command="$(InjectDepsApp) &quot;$(PublishDepsFilePath)&quot; $(RuntimeIdentifier) " />
</Target>

Expand Down
6 changes: 3 additions & 3 deletions src/Shared/E2ETesting/E2ETesting.targets
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</ItemGroup>
</Target>

<Target Name="_AddTestProjectMetadataAttributes" BeforeTargets="BeforeCompile" DependsOnTargets="_ResolveTestProjectReferences">
<Target Name="_AddTestProjectMetadataAttributes" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="_ResolveTestProjectReferences">
<ItemGroup>
<_ContentRootMetadata
Condition="'%(_ContentRootProjectReferences.Identity)' != ''"
Expand All @@ -98,7 +98,7 @@
</ItemGroup>
</Target>

<Target Name="_AddSeleniumSupportedMetadataAttribute" BeforeTargets="BeforeCompile">
<Target Name="_AddSeleniumSupportedMetadataAttribute" BeforeTargets="GetAssemblyAttributes">
<PropertyGroup>
<_SeleniumE2ETestsSupportedAttributeValue>false</_SeleniumE2ETestsSupportedAttributeValue>
<_SeleniumE2ETestsSupportedAttributeValue Condition="'$(SeleniumE2ETestsSupported)' == 'true'">true</_SeleniumE2ETestsSupportedAttributeValue>
Expand All @@ -118,7 +118,7 @@
</ItemGroup>
</Target>

<Target Name="_AddProcessTrackingMetadataAttribute" BeforeTargets="BeforeCompile">
<Target Name="_AddProcessTrackingMetadataAttribute" BeforeTargets="GetAssemblyAttributes">
<MakeDir Directories="$(SeleniumProcessTrackingFolder)" />
<ItemGroup>
<AssemblyAttribute
Expand Down