Skip to content

Fix some fast up to date check issues in VS #32140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 11, 2022
Merged

Fix some fast up to date check issues in VS #32140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dbeacda
Fix some fast up to date check issues in VS
Pilchie Apr 24, 2021
f0cc2fe
A couple more
Pilchie Jan 4, 2022
cca9e4f
Make native dependencies contribute to VS fast up to date check
Pilchie Jan 7, 2022
0661a5f
Update Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
Pilchie Jan 10, 2022
994f7cd
Update Microsoft.AspNetCore.Identity.FunctionalTests.csproj
Pilchie Jan 10, 2022
a89196d
Merge branch 'main' into fast-up-to-date
Pilchie Jan 10, 2022
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
1 change: 0 additions & 1 deletion ...ents/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<ItemGroup>
<YarnInputs Include="$(YarnWorkingDir)**" Exclude="$(YarnWorkingDir)node_modules\**;$(YarnWorkingDir)*.d.ts;$(YarnWorkingDir)dist\**" />
<YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js" />
<YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js.map" Condition="'$(Configuration)' == 'Debug'" />

<Content Remove="$(YarnWorkingDir)**" />
<None Include="$(YarnWorkingDir)*" Exclude="$(YarnWorkingDir)node_modules\**" />
Expand Down
1 change: 0 additions & 1 deletion ...mbly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<ItemGroup>
<YarnInputs Include="$(YarnWorkingDir)**" Exclude="$(YarnWorkingDir)node_modules\**;$(YarnWorkingDir)*.d.ts;$(YarnWorkingDir)dist\**" />
<YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js" />
<YarnOutputs Include="$(YarnWorkingDir)dist\$(Configuration)\AuthenticationService.js.map" Condition="'$(Configuration)' == 'Debug'" />

<Content Remove="$(YarnWorkingDir)**" />
<None Include="$(YarnWorkingDir)*" Exclude="$(YarnWorkingDir)node_modules\**" />
Expand Down
2 changes: 1 addition & 1 deletion src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/Microsoft.AspNetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore" />
<Reference Include="Microsoft.AspNetCore.TestHost" />
<Content Include="Microsoft.AspNetCore.TestHost.StaticWebAssets.xml" CopyToOutputDirectory="Always" />
<Content Include="Microsoft.AspNetCore.TestHost.StaticWebAssets.xml" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
16 changes: 4 additions & 12 deletions ...ion.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,10 @@
</ItemGroup>

<ItemGroup>
<None Update="current.pfx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="expired.pfx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="future.pfx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="test.pfx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="current.pfx" CopyToOutputDirectory="PreserveNewest" />
<None Update="expired.pfx" CopyToOutputDirectory="PreserveNewest" />
<None Update="future.pfx" CopyToOutputDirectory="PreserveNewest" />
<None Update="test.pfx" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
10 changes: 3 additions & 7 deletions ...entity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
Expand Down Expand Up @@ -29,12 +29,8 @@
</ItemGroup>

<ItemGroup>
<None Update="Testing.DefaultWebSite.StaticWebAssets.V4.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Testing.DefaultWebSite.StaticWebAssets.V5.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Testing.DefaultWebSite.StaticWebAssets.V4.xml" CopyToOutputDirectory="PreserveNewest" />
<None Update="Testing.DefaultWebSite.StaticWebAssets.V5.xml" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<Target Name="AddProjectReferenceAssemblyInfo" BeforeTargets="GetAssemblyAttributes" DependsOnTargets="ResolveAssemblyReferences">
Expand Down
5 changes: 4 additions & 1 deletion src/Servers/IIS/AspNetCoreModuleV2/Symbols/Microsoft.AspNetCore.ANCMSymbols.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project>
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
<Import Project="..\..\build\assets.props" />

Expand Down Expand Up @@ -30,6 +30,9 @@
<ItemGroup Condition=" '$(BuildIisNativeProjects)' == 'true' ">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="$(NativeVCPlatform)" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(NativeVCPlatform)" />

<UpToDateCheckInput Include="$(AspNetCoreModuleV2OutOfProcessHandlerDll)" />
<UpToDateCheckInput Include="$(AspNetCoreModuleV2ShimDll)" />
Comment on lines +34 to +35
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it help to set $(GeneratePackageOnBuild) to true and add an @(UpToDateCheckBuilt) item for the produced package❔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you proposing that to solve the fact that this project doesn't generate an output assembly, or for some other reason?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, to solve the lack of an output assembly -- if it works 😃

</ItemGroup>

<Target Name="AddPackNativeComponents" AfterTargets="_CalculateInputsOutputsForPack" Condition="'$(BuildIisNativeProjects)' == 'true' AND '$(PackNativeAssets)' == 'true'">
Expand Down
6 changes: 4 additions & 2 deletions src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
Expand Down Expand Up @@ -36,7 +36,9 @@
<ItemGroup Condition=" '$(BuildIisNativeProjects)' == 'true' ">
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="x64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="Win32" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="ARM64" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj" Platform="ARM64" />

<UpToDateCheckInput Include="$(AspNetCoreModuleV2InProcessHandlerDll)" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>IIS.FunctionalTests</TestGroupName>
<DefineConstants>IIS_FUNCTIONALS</DefineConstants>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion ...Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/IIS.NewHandler.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>IISNewHandler.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<DefineConstants>NEWHANDLER_FUNCTIONALS</DefineConstants>
<SkipTests Condition=" '$(SkipIISNewHandlerTests)' == 'true' ">true</SkipTests>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>IISNewShim.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<DefineConstants>NEWSHIM_FUNCTIONALS</DefineConstants>
<SkipTests Condition=" '$(SkipIISNewShimTests)' == 'true' ">true</SkipTests>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/IIS/test/IIS.ShadowCopy.Tests/IIS.ShadowCopy.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>IIS.ShadowCopy.Tests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/IISExpress.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<DefineConstants>IISEXPRESS_FUNCTIONALS</DefineConstants>
<TestGroupName>IISExpress.FunctionalTests</TestGroupName>
<SkipTests Condition=" '$(SkipIISExpressTests)' == 'true' ">true</SkipTests>
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<Compile Include="..\shared\**\*.cs" />
<Compile Include="..\InProcessWebSite\*.cs" />
<Compile Include="..\InProcessWebSite\Properties\*.cs" />
<None Include="..\InProcessWebSite\wwwroot\**" CopyToOutputDirectory="Always" LinkBase="wwwroot/"/>
<None Include="..\InProcessWebSite\web.config" CopyToOutputDirectory="Always" />
<None Include="..\InProcessWebSite\wwwroot\**" CopyToOutputDirectory="PreserveNewest" LinkBase="wwwroot/"/>
<None Include="..\InProcessWebSite\web.config" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\..\..\build\testsite.props" />

Expand All @@ -14,7 +14,7 @@

<ItemGroup>
<Compile Include="..\shared\**\*.cs" />
<None Include="wwwroot\**" CopyToOutputDirectory="Always" />
<None Include="wwwroot\**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions .../IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PackageId>Microsoft.AspNetCore.Server.IntegrationTesting.IIS</PackageId>
<Description>Provides support for integration testing using IIS based servers.</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;iis</PackageTags>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<AspNetCoreModuleOutOfProcessVersion>2.0.0</AspNetCoreModuleOutOfProcessVersion>
<IsTestAssetProject>true</IsTestAssetProject>
<!-- This is used as a package by ASP.NET benchmarking infrastructure. It is meant for internal use only. -->
Expand Down Expand Up @@ -40,6 +39,9 @@

<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="Win32" />
<NativeProjectReference Include="$(MSBuildThisFileDirectory)..\..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="Win32" />

<UpToDateCheckInput Include="$(AspNetCoreModuleV2ShimDll)" />
<UpToDateCheckInput Include="$(AspNetCoreModuleV2OutOfProcessHandlerDll)" />
</ItemGroup>

<Target Name="AddRunNativeComponents" BeforeTargets="AssignTargetPaths" Condition="'$(BuildIisNativeProjects)' == 'true'">
Expand Down
1 change: 0 additions & 1 deletion src/Servers/IIS/build/testsite.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<IISExpressAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.config</IISExpressAppHostConfig>
<IISAppHostConfig>$(MSBuildThisFileDirectory)applicationhost.iis.config</IISAppHostConfig>
<PreserveCompilationContext>false</PreserveCompilationContext>
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
<!-- Work around until we get a new WebSdk -->
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
<HasTestAssetProfile Condition="'$(TestAssetProfile)' != ''">true</HasTestAssetProfile>
Expand Down
6 changes: 1 addition & 5 deletions src/SignalR/clients/ts/FunctionalTests/SignalR.Client.FunctionalTestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
Expand All @@ -10,8 +10,6 @@
</PropertyGroup>

<ItemGroup>
<None Remove="selenium\run-ci-tests.ts" />
<None Remove="selenium\run-tests.ts" />
<None Remove="ts\Common.ts" />
<None Remove="ts\ConnectionTests.ts" />
<None Remove="ts\HubConnectionTests.ts" />
Expand Down Expand Up @@ -43,8 +41,6 @@
</ItemGroup>

<ItemGroup>
<TypeScriptCompile Include="selenium\run-ci-tests.ts" />
<TypeScriptCompile Include="selenium\run-tests.ts" />
<TypeScriptCompile Include="ts\Common.ts" />
<TypeScriptCompile Include="ts\ConnectionTests.ts" />
<TypeScriptCompile Include="ts\HubConnectionTests.ts" />
Expand Down