diff --git a/sdk.sln b/sdk.sln index 153f535b4b1a..4445953cca02 100644 --- a/sdk.sln +++ b/sdk.sln @@ -308,7 +308,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk (2)", "Sdk (2)", "{4ACCAC39-8ECD-45F8-B5AF-EB7E37CD36CC}" ProjectSection(SolutionItems) = preProject src\RazorSdk\Sdk\Sdk.props = src\RazorSdk\Sdk\Sdk.props - src\RazorSdk\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props = src\RazorSdk\Sdk\Sdk.Razor.StaticAssets.ProjectSystem.props src\RazorSdk\Sdk\Sdk.targets = src\RazorSdk\Sdk\Sdk.targets EndProjectSection EndProject @@ -322,8 +321,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets (2)", "Targets (2)" src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets = src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.GenerateAssemblyInfo.targets src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets = src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.MvcApplicationPartsDiscovery.targets src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.props = src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.props - src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.ScopedCss.targets = src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.ScopedCss.targets - src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.StaticWebAssets.targets = src\RazorSdk\Targets\Microsoft.NET.Sdk.Razor.StaticWebAssets.targets src\RazorSdk\Targets\Sdk.Razor.CurrentVersion.props = src\RazorSdk\Targets\Sdk.Razor.CurrentVersion.props src\RazorSdk\Targets\Sdk.Razor.CurrentVersion.targets = src\RazorSdk\Targets\Sdk.Razor.CurrentVersion.targets EndProjectSection @@ -413,6 +410,33 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.GenAPI.Tas EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Web.Tests", "src\Tests\Microsoft.NET.Sdk.Web.Tests\Microsoft.NET.Sdk.Web.Tests.csproj", "{B8A61A5C-A9A4-45C5-97E3-CB368358682F}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticWebAssetsSdk", "StaticWebAssetsSdk", "{9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sdk", "Sdk", "{CA976F33-7BFA-4F56-8F86-AE132B3B4CBE}" + ProjectSection(SolutionItems) = preProject + src\StaticWebAssetsSdk\Sdk\Sdk.props = src\StaticWebAssetsSdk\Sdk\Sdk.props + src\StaticWebAssetsSdk\Sdk\Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props = src\StaticWebAssetsSdk\Sdk\Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props + src\StaticWebAssetsSdk\Sdk\Sdk.targets = src\StaticWebAssetsSdk\Sdk\Sdk.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{C5C73211-A713-40BF-8FC8-A690CCBE66F5}" + ProjectSection(SolutionItems) = preProject + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.props = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.props + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.5_0.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.Pack.targets + src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.targets = src\StaticWebAssetsSdk\Targets\Microsoft.NET.Sdk.StaticWebAssets.targets + src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.props = src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.props + src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.targets = src\StaticWebAssetsSdk\Targets\Sdk.StaticWebAssets.CurrentVersion.targets + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tasks", "Tasks", "{6C8E1E65-EA73-434D-818F-E564BFFE9F86}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.StaticWebAssets.Tasks", "src\StaticWebAssetsSdk\Tasks\Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj", "{3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -799,6 +823,10 @@ Global {B8A61A5C-A9A4-45C5-97E3-CB368358682F}.Debug|Any CPU.Build.0 = Debug|Any CPU {B8A61A5C-A9A4-45C5-97E3-CB368358682F}.Release|Any CPU.ActiveCfg = Release|Any CPU {B8A61A5C-A9A4-45C5-97E3-CB368358682F}.Release|Any CPU.Build.0 = Release|Any CPU + {3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -944,6 +972,11 @@ Global {5F74AD67-A4AD-4660-A63C-844DAAF354C4} = {95D8B040-FD7F-4C86-8E47-341AF630EDA9} {C419AE2D-D318-49EB-8ECA-6A5DC13FE4EA} = {95D8B040-FD7F-4C86-8E47-341AF630EDA9} {B8A61A5C-A9A4-45C5-97E3-CB368358682F} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} + {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} + {CA976F33-7BFA-4F56-8F86-AE132B3B4CBE} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC} + {C5C73211-A713-40BF-8FC8-A690CCBE66F5} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC} + {6C8E1E65-EA73-434D-818F-E564BFFE9F86} = {9E9F3BB2-6FED-47BC-869C-BFAF6E7C85FC} + {3D42A6BA-38DB-4AA5-9F86-8A78D00D9A07} = {6C8E1E65-EA73-434D-818F-E564BFFE9F86} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6} diff --git a/source-build.slnf b/source-build.slnf index 8670ef2f534e..a1cfd81fadd2 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -34,6 +34,7 @@ "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", + "src\\StaticWebAssetsSdk\\Tasks\\Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Tasks\\Microsoft.NET.Build.Tasks.csproj", "src\\WebSdk\\ProjectSystem\\Tasks\\Microsoft.NET.Sdk.Web.ProjectSystem.Tasks.csproj", @@ -44,4 +45,4 @@ "template_feed\\Microsoft.DotNet.Common.ProjectTemplates.8.0\\Microsoft.DotNet.Common.ProjectTemplates.8.0.csproj" ] } -} \ No newline at end of file +} diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 154d8a33ffab..f21197cd6bd7 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -18,7 +18,7 @@ then need the version file there as well. --> - + - + @@ -136,6 +136,7 @@ $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.Worker $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.BlazorWebAssembly $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.Razor + $(ArtifactsBinDir)$(Configuration)\Sdks\Microsoft.NET.Sdk.StaticWebAssets + diff --git a/src/RazorSdk/Sdk/Sdk.props b/src/RazorSdk/Sdk/Sdk.props index 5a684eccc65d..c776da939a17 100644 --- a/src/RazorSdk/Sdk/Sdk.props +++ b/src/RazorSdk/Sdk/Sdk.props @@ -13,9 +13,11 @@ Copyright (c) .NET Foundation. All rights reserved. <_RazorSdkImportsMicrosoftNetSdk Condition="'$(UsingMicrosoftNETSdk)' != 'true'">true + <_RazorSdkImportsMicrosoftNetSdkStaticWebAssets Condition="'$(UsingMicrosoftNETSdkStaticWebAssets)' != 'true'">true + $(MSBuildThisFileDirectory)..\targets\Sdk.Razor.CurrentVersion.props diff --git a/src/RazorSdk/Sdk/Sdk.targets b/src/RazorSdk/Sdk/Sdk.targets index 449936d860e5..30e8e54c10df 100644 --- a/src/RazorSdk/Sdk/Sdk.targets +++ b/src/RazorSdk/Sdk/Sdk.targets @@ -12,6 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved. + $(MSBuildThisFileDirectory)..\targets\Sdk.Razor.CurrentVersion.targets diff --git a/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.props b/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.props index dad333e4fa61..673f64ada2b3 100644 --- a/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.props +++ b/src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.props @@ -36,11 +36,6 @@ Copyright (c) .NET Foundation. All rights reserved. --> true - - true - - $(_Targeting30OrNewerRazorLangVersion) - - $(_TargetingNET60OrLater) - - - $(_TargetingNET50OrLater) - - $(_TargetingNET60OrLater) - - - - - - - - - - - - diff --git a/src/StaticWebAssetsSdk/.editorconfig b/src/StaticWebAssetsSdk/.editorconfig new file mode 100644 index 000000000000..58a365c0b27c --- /dev/null +++ b/src/StaticWebAssetsSdk/.editorconfig @@ -0,0 +1,9 @@ +# C# files +[*.cs] + +#### Core EditorConfig Options #### + +# var preferences +csharp_style_var_elsewhere = true +csharp_style_var_for_built_in_types = true +csharp_style_var_when_type_is_apparent = true diff --git a/src/RazorSdk/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props b/src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props similarity index 98% rename from src/RazorSdk/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props rename to src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props index 721f9e72f8b2..a89902e4f5d9 100644 --- a/src/RazorSdk/Sdk/Sdk.Razor.StaticAssets.ProjectSystem.props +++ b/src/StaticWebAssetsSdk/Sdk/Sdk.StaticWebAssets.StaticAssets.ProjectSystem.props @@ -1,6 +1,6 @@ + + + + <_StaticWebAssetsSdkImportsMicrosoftNetSdk Condition="'$(UsingMicrosoftNETSdk)' != 'true'">true + + + + + + $(MSBuildThisFileDirectory)..\targets\Sdk.StaticWebAssets.CurrentVersion.props + + + + diff --git a/src/StaticWebAssetsSdk/Sdk/Sdk.targets b/src/StaticWebAssetsSdk/Sdk/Sdk.targets new file mode 100644 index 000000000000..b15e16c77ed5 --- /dev/null +++ b/src/StaticWebAssetsSdk/Sdk/Sdk.targets @@ -0,0 +1,22 @@ + + + + + + + $(MSBuildThisFileDirectory)..\targets\Sdk.StaticWebAssets.CurrentVersion.targets + + + + + diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.5_0.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.5_0.targets similarity index 96% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.5_0.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.5_0.targets index fe39bf4d67e9..2ace59d62470 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.5_0.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.5_0.targets @@ -1,6 +1,6 @@ + TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateV1StaticWebAssetsManifest" + AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" + Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" /> + TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ValidateStaticWebAssetsUniquePaths" + AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" + Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" /> + TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAsssetsPropsFile" + AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" + Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" /> + TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.StaticWebAssetsGeneratePackagePropsFile" + AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" + Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" /> + TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.StaticWebAssetsGeneratePackManifest" + AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)" + Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" /> @@ -547,7 +547,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -598,7 +598,7 @@ Copyright (c) .NET Foundation. All rights reserved. - diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.JSModules.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets similarity index 96% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.JSModules.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets index a5b38e4a91a9..1d50c828746f 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.JSModules.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.JSModules.targets @@ -1,6 +1,6 @@ - - + + true @@ -113,7 +113,7 @@ Copyright (c) .NET Foundation. All rights reserved. - + @@ -145,7 +145,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_JSModuleManifestPath>$(IntermediateOutputPath)jsmodules\jsmodules.build.manifest.json - $(PackageId).modules.json + $(PackageId).modules.json @@ -197,7 +197,7 @@ Copyright (c) .NET Foundation. All rights reserved. <_JSModuleManifestPath>$(IntermediateOutputPath)jsmodules\jsmodules.publish.manifest.json - $(PackageId).modules.json + $(PackageId).modules.json diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.CrossTargeting.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets similarity index 85% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.CrossTargeting.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets index 455c530dcf59..45ed3f4249a4 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.CrossTargeting.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.CrossTargeting.targets @@ -1,6 +1,6 @@ - @@ -99,9 +99,9 @@ Copyright (c) .NET Foundation. All rights reserved. - + - + - diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.targets similarity index 91% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.targets index f10623a983c1..01cd275c0c69 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.Pack.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Pack.targets @@ -1,6 +1,6 @@ - + - + - diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.ScopedCss.5_0.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets similarity index 95% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.ScopedCss.5_0.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets index 419b2d68d946..9609dcc738a0 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.ScopedCss.5_0.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.ScopedCss.5_0.targets @@ -1,6 +1,6 @@ - - - - - - + + + + + + @@ -113,7 +113,7 @@ Integration with static web assets: - - - - - - - + + + + + + @@ -91,7 +91,7 @@ Integration with static web assets: - + + + $(MSBuildThisFileDirectory)Sdk.StaticWebAssets.CurrentVersion.props + $(MSBuildThisFileDirectory)Sdk.StaticWebAssets.CurrentVersion.targets + + + diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets similarity index 93% rename from src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets rename to src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets index 3d6fbd352b20..2d9869d19a64 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets +++ b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets @@ -1,6 +1,6 @@ + + + + + + true + + true + + + true + + + + + + diff --git a/src/StaticWebAssetsSdk/Targets/Sdk.StaticWebAssets.CurrentVersion.targets b/src/StaticWebAssetsSdk/Targets/Sdk.StaticWebAssets.CurrentVersion.targets new file mode 100644 index 000000000000..00493365e3f5 --- /dev/null +++ b/src/StaticWebAssetsSdk/Targets/Sdk.StaticWebAssets.CurrentVersion.targets @@ -0,0 +1,137 @@ + + + + + true + + + + + + + + + + $(MSBuildThisFileDirectory)..\ + $(StaticWebAssetsSdkDirectoryRoot)tasks\ + <_StaticWebAssetsSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net8.0 + <_StaticWebAssetsSdkTasksTFM Condition=" '$(_StaticWebAssetsSdkTasksTFM)' == ''">net472 + $(StaticWebAssetsSdkBuildTasksDirectoryRoot)$(_StaticWebAssetsSdkTasksTFM)\Microsoft.NET.Sdk.StaticWebAssets.Tasks.dll + <_StaticWebAssetsSdkToolAssembly>$(StaticWebAssetsSdkDirectoryRoot)..\Microsoft.NET.Sdk.Razor\tools\rzc.dll + + + + <_StaticWebAssetsSdkDotNetHostDirectory>$(NetCoreRoot) + <_StaticWebAssetsSdkDotNetHostFileName>dotnet + <_StaticWebAssetsSdkDotNetHostFileName Condition="'$(OS)' == 'Windows_NT'">dotnet.exe + + + + + + + + <_TargetingNETCoreApp30OrLater>true + <_TargetingNET50OrLater>true + <_TargetingNET60OrLater>true + <_RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">7.0 + + + + + <_TargetingNETCoreApp30OrLater>true + <_TargetingNET50OrLater>true + <_TargetingNET60OrLater>true + <_RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">6.0 + + + + + <_TargetingNETCoreApp30OrLater>true + <_TargetingNET50OrLater>true + <_RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">5.0 + + + + + <_TargetingNETCoreApp30OrLater>true + <_RazorLangVersion Condition="'$(RazorLangVersion)' == '' ">3.0 + + + + + <_TargetingNETStandard21OrLater>true + + + + + <_TargetingNETStandard20OrLater>true + + + + + + + <_RazorLangVersion Condition="'$(RazorLangVersion)' != ''">$(RazorLangVersion) + + + <_RazorLangVersion Condition="'$(_RazorLangVersion)' == ''">2.1 + + + <_Targeting30OrNewerRazorLangVersion Condition=" + '$(_RazorLangVersion)' == 'Latest' OR + '$(_RazorLangVersion)' == 'Experimental' OR + ('$(_RazorLangVersion)' != '' AND '$(_RazorLangVersion)' >= '3.0')">true + + + $(_Targeting30OrNewerRazorLangVersion) + + $(_TargetingNET60OrLater) + + + $(_TargetingNET50OrLater) + + $(_TargetingNET60OrLater) + + + + + + + + + + + + + + + + + + diff --git a/src/RazorSdk/Tasks/ApplyCssScopes.cs b/src/StaticWebAssetsSdk/Tasks/ApplyCssScopes.cs similarity index 99% rename from src/RazorSdk/Tasks/ApplyCssScopes.cs rename to src/StaticWebAssetsSdk/Tasks/ApplyCssScopes.cs index e8e4624d86e9..ca378f62025b 100644 --- a/src/RazorSdk/Tasks/ApplyCssScopes.cs +++ b/src/StaticWebAssetsSdk/Tasks/ApplyCssScopes.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ApplyCssScopes : Task { diff --git a/src/RazorSdk/Tasks/ApplyJsModules.cs b/src/StaticWebAssetsSdk/Tasks/ApplyJsModules.cs similarity index 99% rename from src/RazorSdk/Tasks/ApplyJsModules.cs rename to src/StaticWebAssetsSdk/Tasks/ApplyJsModules.cs index 608a3805001b..303ea1431a70 100644 --- a/src/RazorSdk/Tasks/ApplyJsModules.cs +++ b/src/StaticWebAssetsSdk/Tasks/ApplyJsModules.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ApplyJsModules : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/CollectStaticWebAssetsToCopy.cs b/src/StaticWebAssetsSdk/Tasks/CollectStaticWebAssetsToCopy.cs similarity index 97% rename from src/RazorSdk/Tasks/StaticWebAssets/CollectStaticWebAssetsToCopy.cs rename to src/StaticWebAssetsSdk/Tasks/CollectStaticWebAssetsToCopy.cs index b53caa1082c0..6e8659d8c312 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/CollectStaticWebAssetsToCopy.cs +++ b/src/StaticWebAssetsSdk/Tasks/CollectStaticWebAssetsToCopy.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class CollectStaticWebAssetsToCopy : Task @@ -30,7 +30,7 @@ public override bool Execute() { foreach (var asset in Assets.Select(StaticWebAsset.FromTaskItem)) { - string fileOutputPath = null; + string fileOutputPath = null; if (!(asset.IsDiscovered() || asset.IsComputed())) { Log.LogMessage(MessageImportance.Low, "Skipping asset '{0}' since source type is '{1}'", asset.Identity, asset.SourceType); diff --git a/src/RazorSdk/Tasks/ComputeCssScope.cs b/src/StaticWebAssetsSdk/Tasks/ComputeCssScope.cs similarity index 97% rename from src/RazorSdk/Tasks/ComputeCssScope.cs rename to src/StaticWebAssetsSdk/Tasks/ComputeCssScope.cs index 4c334ce544c4..9c5fe74b3e85 100644 --- a/src/RazorSdk/Tasks/ComputeCssScope.cs +++ b/src/StaticWebAssetsSdk/Tasks/ComputeCssScope.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ComputeCssScope : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ComputeReferenceStaticWebAssetItems.cs b/src/StaticWebAssetsSdk/Tasks/ComputeReferenceStaticWebAssetItems.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/ComputeReferenceStaticWebAssetItems.cs rename to src/StaticWebAssetsSdk/Tasks/ComputeReferenceStaticWebAssetItems.cs index f3ec2e8371eb..674400c4162a 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ComputeReferenceStaticWebAssetItems.cs +++ b/src/StaticWebAssetsSdk/Tasks/ComputeReferenceStaticWebAssetItems.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ComputeReferenceStaticWebAssetItems : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsForCurrentProject.cs b/src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsForCurrentProject.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsForCurrentProject.cs rename to src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsForCurrentProject.cs index eda367e12630..16906579a7aa 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsForCurrentProject.cs +++ b/src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsForCurrentProject.cs @@ -7,7 +7,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ComputeStaticWebAssetsForCurrentProject : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsTargetPaths.cs b/src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsTargetPaths.cs similarity index 96% rename from src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsTargetPaths.cs rename to src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsTargetPaths.cs index b4005643c992..5e97581d07bf 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ComputeStaticWebAssetsTargetPaths.cs +++ b/src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsTargetPaths.cs @@ -6,7 +6,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ComputeStaticWebAssetsTargetPaths : Task { @@ -43,7 +43,7 @@ public override bool Execute() } result.SetMetadata("TargetPath", targetPath); - + AssetsWithTargetPath[i] = result; } } diff --git a/src/RazorSdk/Tasks/ConcatenateCssFiles.cs b/src/StaticWebAssetsSdk/Tasks/ConcatenateCssFiles.cs similarity index 99% rename from src/RazorSdk/Tasks/ConcatenateCssFiles.cs rename to src/StaticWebAssetsSdk/Tasks/ConcatenateCssFiles.cs index 1666563dc2ac..3a9cbd5ed7c8 100644 --- a/src/RazorSdk/Tasks/ConcatenateCssFiles.cs +++ b/src/StaticWebAssetsSdk/Tasks/ConcatenateCssFiles.cs @@ -10,7 +10,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ConcatenateCssFiles : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/DefineStaticWebAssets.cs b/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/DefineStaticWebAssets.cs rename to src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.cs index afd3ca512169..0d543800b31f 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/DefineStaticWebAssets.cs +++ b/src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssets.cs @@ -10,7 +10,7 @@ using Microsoft.Build.Utilities; using Microsoft.Extensions.FileSystemGlobbing; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { // Define static web asset builds a normalized static web asset out of a set of candidate assets. // The BaseAssets might already define all the properties the assets care about and in that case, diff --git a/src/RazorSdk/Tasks/DiscoverDefaultScopedCssItems.cs b/src/StaticWebAssetsSdk/Tasks/DiscoverDefaultScopedCssItems.cs similarity index 97% rename from src/RazorSdk/Tasks/DiscoverDefaultScopedCssItems.cs rename to src/StaticWebAssetsSdk/Tasks/DiscoverDefaultScopedCssItems.cs index 9f8c798a7dea..ad24c80048ca 100644 --- a/src/RazorSdk/Tasks/DiscoverDefaultScopedCssItems.cs +++ b/src/StaticWebAssetsSdk/Tasks/DiscoverDefaultScopedCssItems.cs @@ -6,7 +6,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class DiscoverDefaultScopedCssItems : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/DiscoverStaticWebAssets.cs b/src/StaticWebAssetsSdk/Tasks/DiscoverStaticWebAssets.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/DiscoverStaticWebAssets.cs rename to src/StaticWebAssetsSdk/Tasks/DiscoverStaticWebAssets.cs index 20735b6cce55..65e999eee22d 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/DiscoverStaticWebAssets.cs +++ b/src/StaticWebAssetsSdk/Tasks/DiscoverStaticWebAssets.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Utilities; using Microsoft.Extensions.FileSystemGlobbing; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class DiscoverStaticWebAssets : Task { diff --git a/src/RazorSdk/Tasks/GenerateJSModuleManifest.cs b/src/StaticWebAssetsSdk/Tasks/GenerateJSModuleManifest.cs similarity index 97% rename from src/RazorSdk/Tasks/GenerateJSModuleManifest.cs rename to src/StaticWebAssetsSdk/Tasks/GenerateJSModuleManifest.cs index 31e5d4407e0c..36798bbd30f3 100644 --- a/src/RazorSdk/Tasks/GenerateJSModuleManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/GenerateJSModuleManifest.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class GenerateJSModuleManifest : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsDevelopmentManifest.cs b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsDevelopmentManifest.cs rename to src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs index 4e6465c1d5b0..7b56ac40c242 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsDevelopmentManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs @@ -11,7 +11,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { // The manifest needs to always be case sensitive, since we don't know what the final runtime environment // will be. The runtime is responsible for merging the tree nodes in the manifest when the underlying OS diff --git a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsManifest.cs b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsManifest.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsManifest.cs rename to src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsManifest.cs index fbb9c7f083f3..5e6c2911d92a 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAssetsManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsManifest.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class GenerateStaticWebAssetsManifest : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAsssetsPropsFile.cs b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAsssetsPropsFile.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAsssetsPropsFile.cs rename to src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAsssetsPropsFile.cs index 42d5fa7a16c8..fc3f61635eb2 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/GenerateStaticWebAsssetsPropsFile.cs +++ b/src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAsssetsPropsFile.cs @@ -13,7 +13,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class GenerateStaticWebAsssetsPropsFile : Task { @@ -40,7 +40,7 @@ public class GenerateStaticWebAsssetsPropsFile : Task public ITaskItem[] StaticWebAssets { get; set; } public string PackagePathPrefix { get; set; } = "staticwebassets"; - + public bool AllowEmptySourceType { get; set; } public override bool Execute() diff --git a/src/RazorSdk/Tasks/StaticWebAssets/GenerateV1StaticWebAssetsManifest.cs b/src/StaticWebAssetsSdk/Tasks/GenerateV1StaticWebAssetsManifest.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/GenerateV1StaticWebAssetsManifest.cs rename to src/StaticWebAssetsSdk/Tasks/GenerateV1StaticWebAssetsManifest.cs index ac37e3a843b8..9ea23655ad97 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/GenerateV1StaticWebAssetsManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/GenerateV1StaticWebAssetsManifest.cs @@ -12,7 +12,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class GenerateV1StaticWebAssetsManifest : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/MergeConfigurationProperties.cs b/src/StaticWebAssetsSdk/Tasks/MergeConfigurationProperties.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/MergeConfigurationProperties.cs rename to src/StaticWebAssetsSdk/Tasks/MergeConfigurationProperties.cs index c63cb8656709..b54b27de04d1 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/MergeConfigurationProperties.cs +++ b/src/StaticWebAssetsSdk/Tasks/MergeConfigurationProperties.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class MergeConfigurationProperties : Task { diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj new file mode 100644 index 000000000000..e8541a00012b --- /dev/null +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -0,0 +1,124 @@ + + + + $(RepoRoot)\src\StaticWebAssetsSdk\ + Microsoft.NET.Sdk.StaticWebAssets + $(Configuration)\Sdks\$(PackageId)\tasks + + + + + + Library + + false + false + false + + true + true + + false + + true + + $(BaseOutputPath) + true + $(ArtifactsBinDir)$(Configuration)\Sdks\$(PackageId)\ + true + + + + SDK for building and publishing applications containing static web assets. + Library + Microsoft.NET.Sdk.StaticWebAssets + $(SdkTargetFramework);net472 + + + + + + + + + + + + + + Shared\CommandLine\%(FileName) + + + Shared\ServerProtocol\%(FileName) + + + Shared\PipeName.cs + + + Shared\MutexName.cs + + + Shared\Client.cs + + + Shared\DotnetToolTask.cs + + + + + + true + targets + + + true + Sdk + + + + + + All + true + + + + + + <_FileSystemGlobbing Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)' == 'Microsoft.Extensions.FileSystemGlobbing'" /> + <_FileSystemGlobbingContent Include ="@(_FileSystemGlobbing)" TargetPath="tasks\$(SdkTargetFramework)\%(_FileSystemGlobbing.Filename)%(_FileSystemGlobbing.Extension)" /> + + + + + + + + + + + + %(AdditionalContent.PackagePath)\%(AdditionalContent.RecursiveDir)%(AdditionalContent.Filename)%(AdditionalContent.Extension) + + + + + + + + + + + + + + + + + + + + diff --git a/src/RazorSdk/Tasks/StaticWebAssets/OSPath.cs b/src/StaticWebAssetsSdk/Tasks/OSPath.cs similarity index 92% rename from src/RazorSdk/Tasks/StaticWebAssets/OSPath.cs rename to src/StaticWebAssetsSdk/Tasks/OSPath.cs index ffe89ee79568..52841bed16ba 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/OSPath.cs +++ b/src/StaticWebAssetsSdk/Tasks/OSPath.cs @@ -5,7 +5,7 @@ using System; using System.Runtime.InteropServices; -namespace Microsoft.AspNetCore.Razor +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { internal static class OSPath { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ReadStaticWebAssetsManifestFile.cs b/src/StaticWebAssetsSdk/Tasks/ReadStaticWebAssetsManifestFile.cs similarity index 96% rename from src/RazorSdk/Tasks/StaticWebAssets/ReadStaticWebAssetsManifestFile.cs rename to src/StaticWebAssetsSdk/Tasks/ReadStaticWebAssetsManifestFile.cs index a371284ee307..e0b845023901 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ReadStaticWebAssetsManifestFile.cs +++ b/src/StaticWebAssetsSdk/Tasks/ReadStaticWebAssetsManifestFile.cs @@ -7,7 +7,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ReadStaticWebAssetsManifestFile : Task { diff --git a/src/RazorSdk/Tasks/ResolveAllScopedCssAssets.cs b/src/StaticWebAssetsSdk/Tasks/ResolveAllScopedCssAssets.cs similarity index 96% rename from src/RazorSdk/Tasks/ResolveAllScopedCssAssets.cs rename to src/StaticWebAssetsSdk/Tasks/ResolveAllScopedCssAssets.cs index 338424749815..cac182f79d35 100644 --- a/src/RazorSdk/Tasks/ResolveAllScopedCssAssets.cs +++ b/src/StaticWebAssetsSdk/Tasks/ResolveAllScopedCssAssets.cs @@ -6,7 +6,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ResolveAllScopedCssAssets : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ResolveStaticWebAssetsEffectiveTargetFramework.cs b/src/StaticWebAssetsSdk/Tasks/ResolveStaticWebAssetsEffectiveTargetFramework.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/ResolveStaticWebAssetsEffectiveTargetFramework.cs rename to src/StaticWebAssetsSdk/Tasks/ResolveStaticWebAssetsEffectiveTargetFramework.cs index 0620eabaa07f..dc9296f0f8ff 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ResolveStaticWebAssetsEffectiveTargetFramework.cs +++ b/src/StaticWebAssetsSdk/Tasks/ResolveStaticWebAssetsEffectiveTargetFramework.cs @@ -6,7 +6,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ResolveStaticWebAssetsEffectiveTargetFramework : Task { @@ -54,7 +54,7 @@ public FrameworkItem(ITaskItem item) public string Moniker { get; set; } public string TargetFrameworkIdentifier { get; set; } - + public string TargetFrameworkVersion { get; set; } internal double GetStaticWebAssetsVersion() => diff --git a/src/RazorSdk/Tasks/RewriteCss.cs b/src/StaticWebAssetsSdk/Tasks/RewriteCss.cs similarity index 96% rename from src/RazorSdk/Tasks/RewriteCss.cs rename to src/StaticWebAssetsSdk/Tasks/RewriteCss.cs index dc791257907c..300d4c59331b 100644 --- a/src/RazorSdk/Tasks/RewriteCss.cs +++ b/src/StaticWebAssetsSdk/Tasks/RewriteCss.cs @@ -3,9 +3,10 @@ using System.IO; using System.Text; +using Microsoft.AspNetCore.Razor.Tasks; using Microsoft.Build.Framework; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class RewriteCss : DotNetToolTask { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/StaticAssetsManifest.cs b/src/StaticWebAssetsSdk/Tasks/StaticAssetsManifest.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/StaticAssetsManifest.cs rename to src/StaticWebAssetsSdk/Tasks/StaticAssetsManifest.cs index 885c45d34009..243a1c9fad47 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/StaticAssetsManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticAssetsManifest.cs @@ -11,7 +11,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { [DebuggerDisplay("{" + nameof(GetDebuggerDisplay) + "(),nq}")] public class StaticWebAssetsManifest : IEquatable diff --git a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAsset.cs b/src/StaticWebAssetsSdk/Tasks/StaticWebAsset.cs similarity index 99% rename from src/RazorSdk/Tasks/StaticWebAssets/StaticWebAsset.cs rename to src/StaticWebAssetsSdk/Tasks/StaticWebAsset.cs index 0077ec002730..68d08c351db1 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAsset.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticWebAsset.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { [DebuggerDisplay("{" + nameof(GetDebuggerDisplay) + "(),nq}")] public class StaticWebAsset @@ -253,7 +253,7 @@ public void Validate() if (string.IsNullOrEmpty(OriginalItemSpec)) { throw new InvalidOperationException($"The '{nameof(OriginalItemSpec)}' for the asset must be defined for '{Identity}'."); - } + } switch (AssetKind) { @@ -397,7 +397,7 @@ public bool IsForCurrentAndReferencedProjects() public bool IsPrimaryAsset() => string.Equals(AssetRole, AssetRoles.Primary, StringComparison.Ordinal); - + public bool IsRelatedAsset() => string.Equals(AssetRole, AssetRoles.Related, StringComparison.Ordinal); @@ -423,14 +423,14 @@ public static string ComputeAssetRelativePath(ITaskItem asset, out string metada { var relativePath = asset.GetMetadata("RelativePath"); if (!string.IsNullOrEmpty(relativePath)) - { + { metadataProperty = "RelativePath"; return relativePath; } var targetPath = asset.GetMetadata("TargetPath"); if (!string.IsNullOrEmpty(targetPath)) - { + { metadataProperty = "TargetPath"; return targetPath; } diff --git a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackManifest.cs b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackManifest.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackManifest.cs rename to src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackManifest.cs index 326febe0d3f8..b52faf5eb17f 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackManifest.cs @@ -12,7 +12,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class StaticWebAssetsGeneratePackManifest : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackagePropsFile.cs b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackagePropsFile.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackagePropsFile.cs rename to src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackagePropsFile.cs index 285847691e5a..3b98db0b6c94 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsGeneratePackagePropsFile.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsGeneratePackagePropsFile.cs @@ -11,7 +11,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class StaticWebAssetsGeneratePackagePropsFile : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsReadPackManifest.cs b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsReadPackManifest.cs similarity index 97% rename from src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsReadPackManifest.cs rename to src/StaticWebAssetsSdk/Tasks/StaticWebAssetsReadPackManifest.cs index bd63212b8bcc..a443d6024aa6 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/StaticWebAssetsReadPackManifest.cs +++ b/src/StaticWebAssetsSdk/Tasks/StaticWebAssetsReadPackManifest.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class StaticWebAssetsReadPackManifest : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/UpdatePackageStaticWebAssets.cs b/src/StaticWebAssetsSdk/Tasks/UpdatePackageStaticWebAssets.cs similarity index 96% rename from src/RazorSdk/Tasks/StaticWebAssets/UpdatePackageStaticWebAssets.cs rename to src/StaticWebAssetsSdk/Tasks/UpdatePackageStaticWebAssets.cs index 2992bec26b1d..b87283dabd8b 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/UpdatePackageStaticWebAssets.cs +++ b/src/StaticWebAssetsSdk/Tasks/UpdatePackageStaticWebAssets.cs @@ -9,7 +9,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class UpdatePackageStaticWebAssets : Task { diff --git a/src/RazorSdk/Tasks/StaticWebAssets/ValidateStaticWebAssetsUniquePaths.cs b/src/StaticWebAssetsSdk/Tasks/ValidateStaticWebAssetsUniquePaths.cs similarity index 98% rename from src/RazorSdk/Tasks/StaticWebAssets/ValidateStaticWebAssetsUniquePaths.cs rename to src/StaticWebAssetsSdk/Tasks/ValidateStaticWebAssetsUniquePaths.cs index 4aa48ef82289..7558b8d5c43a 100644 --- a/src/RazorSdk/Tasks/StaticWebAssets/ValidateStaticWebAssetsUniquePaths.cs +++ b/src/StaticWebAssetsSdk/Tasks/ValidateStaticWebAssetsUniquePaths.cs @@ -8,7 +8,7 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -namespace Microsoft.AspNetCore.Razor.Tasks +namespace Microsoft.AspNetCore.StaticWebAssets.Tasks { public class ValidateStaticWebAssetsUniquePaths : Task { diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs index 6bf45b7d99c2..1bde27c2cecd 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs @@ -4,11 +4,10 @@ using System.IO; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; -using Xunit; using Xunit.Abstractions; namespace Microsoft.NET.Sdk.BlazorWebAssembly.Tests diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs index 4c70d788a85a..e93cdc3d254e 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorWasmStaticWebAssetsIntegrationTest.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Xml.Linq; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ComputeBlazorFilesToCompressTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ComputeBlazorFilesToCompressTest.cs index 856454f494ee..4bfbad2fa742 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ComputeBlazorFilesToCompressTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ComputeBlazorFilesToCompressTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.NET.TestFramework; using Moq; diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj index ef699dfc3501..9b998e3f379c 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests.csproj @@ -51,6 +51,7 @@ + diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs index 4c7895754c4f..2c3f12643c4a 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs @@ -7,7 +7,7 @@ using System.Text.Json; using System.Xml.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs index 0a5b41f15481..eeb24a9335cc 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmJsModulesIntegrationTests.cs @@ -8,7 +8,7 @@ using System.Text.Json; using System.Xml.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs index 7cfbdbb1bc8b..184e88caa965 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ApplyCssScopesTest.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Moq; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs index 3aa25ccd7f44..ef1db84b0e8d 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/AspNetSdkBaselineTest.cs @@ -8,7 +8,7 @@ using System.Runtime.CompilerServices; using System.Text.Json; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework; using Xunit; using Xunit.Abstractions; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ComputeCssScopesTests.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ComputeCssScopesTests.cs index 991e946493ba..5edf289cf9e5 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ComputeCssScopesTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ComputeCssScopesTests.cs @@ -6,8 +6,8 @@ using System.Text.RegularExpressions; using FluentAssertions; using Microsoft.Build.Utilities; -using Microsoft.AspNetCore.Razor.Tasks; using Xunit; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Test { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ConcatenateFilesTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ConcatenateFilesTest.cs index c667377451ad..3a6bdb698ae4 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ConcatenateFilesTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ConcatenateFilesTest.cs @@ -7,9 +7,9 @@ using FluentAssertions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.AspNetCore.Razor.Tasks; using Microsoft.NET.TestFramework.Assertions; using Xunit; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Test { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/DiscoverDefaultScopedCssItemsTests.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/DiscoverDefaultScopedCssItemsTests.cs index 35229da98d3f..742ad638db5d 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/DiscoverDefaultScopedCssItemsTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/DiscoverDefaultScopedCssItemsTests.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using FluentAssertions; using Microsoft.Build.Utilities; -using Microsoft.AspNetCore.Razor.Tasks; using Xunit; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Test { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsDevelopmentManifestTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsDevelopmentManifestTest.cs index b2857b714a55..7cd7ae4fdf74 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsDevelopmentManifestTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsDevelopmentManifestTest.cs @@ -7,11 +7,11 @@ using System.IO; using System.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Moq; using Xunit; -using static Microsoft.AspNetCore.Razor.Tasks.GenerateStaticWebAssetsDevelopmentManifest; +using static Microsoft.AspNetCore.StaticWebAssets.Tasks.GenerateStaticWebAssetsDevelopmentManifest; namespace Microsoft.NET.Sdk.Razor.Tests { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsPropsFileTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsPropsFileTest.cs index 796fa25575fb..bd6cfb3d1c65 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsPropsFileTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateStaticWebAssetsPropsFileTest.cs @@ -6,9 +6,9 @@ using FluentAssertions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.AspNetCore.Razor.Tasks; using Moq; using Xunit; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Test { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateV1StaticWebAssetsManifestTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateV1StaticWebAssetsManifestTest.cs index 28bad6b67292..078d32a395bf 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateV1StaticWebAssetsManifestTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/GenerateV1StaticWebAssetsManifestTest.cs @@ -6,9 +6,9 @@ using FluentAssertions; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Microsoft.AspNetCore.Razor.Tasks; using Moq; using Xunit; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Test { diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/JsModulesIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/JsModulesIntegrationTest.cs index d49be6793a58..43aced964ca4 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/JsModulesIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/JsModulesIntegrationTest.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Xml.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; using Microsoft.NET.TestFramework.Utilities; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/Microsoft.NET.Sdk.Razor.Tests.csproj b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/Microsoft.NET.Sdk.Razor.Tests.csproj index cc4d4804c2b7..9761249e51d0 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/Microsoft.NET.Sdk.Razor.Tests.csproj +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/Microsoft.NET.Sdk.Razor.Tests.csproj @@ -45,6 +45,7 @@ + diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ResolveAllScopedCssAssetsTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ResolveAllScopedCssAssetsTest.cs index b188b9a65cf0..2e4c7aa13afa 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ResolveAllScopedCssAssetsTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ResolveAllScopedCssAssetsTest.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Utilities; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs index 232ea5137ca6..fdef1f8adb5c 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs @@ -4,12 +4,10 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection.Metadata; using System.Text.RegularExpressions; using System.Xml.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; -using Microsoft.Build.Evaluation; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeReferenceStaticWebAssetItemsTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeReferenceStaticWebAssetItemsTest.cs index 2371ba739131..2334bec456d6 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeReferenceStaticWebAssetItemsTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeReferenceStaticWebAssetItemsTest.cs @@ -1,12 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections.Generic; using System.IO; -using System.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Moq; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeStaticWebAssetsForCurrentProjectTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeStaticWebAssetsForCurrentProjectTest.cs index 7815a1374b16..a8bccfc7a7fa 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeStaticWebAssetsForCurrentProjectTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ComputeStaticWebAssetsForCurrentProjectTest.cs @@ -1,11 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections.Generic; using System.IO; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Moq; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs index 423bb38fea17..ed477609ab17 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/DiscoverStaticWebAssetsTest.cs @@ -1,12 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using System; using System.Collections.Generic; using System.IO; using System.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Moq; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs index 85af61b231e5..4799bc444c89 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsManifestTest.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.NET.TestFramework; using Moq; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/MergeConfigurationPropertiesTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/MergeConfigurationPropertiesTest.cs index 2b54ae280da5..f452f654f78e 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/MergeConfigurationPropertiesTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/MergeConfigurationPropertiesTest.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Microsoft.NET.TestFramework; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ReadStaticWebAssetsManifestFileTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ReadStaticWebAssetsManifestFileTest.cs index ea9efd2e48e0..193e7ed9143e 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ReadStaticWebAssetsManifestFileTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/ReadStaticWebAssetsManifestFileTest.cs @@ -4,12 +4,10 @@ using System; using System.Collections.Generic; using System.IO; -using System.Security.Principal; using System.Text.Json; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; using Microsoft.NET.TestFramework; using Moq; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineComparer.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineComparer.cs index 4fbb015ac931..69996e8dd26a 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineComparer.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineComparer.cs @@ -7,7 +7,7 @@ using System.IO; using System.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Tests; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs index 59f0ed397002..0e7d31b9c1f1 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsBaselineFactory.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; namespace Microsoft.NET.Sdk.Razor.Tests; public class StaticWebAssetsBaselineFactory diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsGeneratePackagePropsFileTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsGeneratePackagePropsFileTest.cs index a3f0dc7da31f..bc7370fbff5c 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsGeneratePackagePropsFileTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsGeneratePackagePropsFileTest.cs @@ -1,12 +1,9 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; -using System.Collections.Generic; using System.IO; -using System.Text; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Moq; using Xunit; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs index 20c6a61b81e4..ae2347c67f6b 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; using System.Xml.Linq; using FluentAssertions; -using Microsoft.AspNetCore.Razor.Tasks; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.NET.TestFramework; using Microsoft.NET.TestFramework.Assertions; using Microsoft.NET.TestFramework.Commands; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ValidateStaticWebAssetsUniquePathsTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ValidateStaticWebAssetsUniquePathsTest.cs index c39ab45d35a4..00d2c0425dc0 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ValidateStaticWebAssetsUniquePathsTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ValidateStaticWebAssetsUniquePathsTest.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.IO; using FluentAssertions; +using Microsoft.AspNetCore.StaticWebAssets.Tasks; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Moq;