Remove .NET Framework project templates
This commit is contained in:
parent
2ca560f0b2
commit
0af2acd6ff
|
|
@ -1,18 +1,14 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -13,11 +12,8 @@
|
||||||
<Compile Include="Program.fs" />
|
<Compile Include="Program.fs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,12 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
|
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-0ce56475-d1db-490f-8af1-a881ea4fcd2d</UserSecretsId>
|
||||||
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
|
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -19,27 +17,11 @@
|
||||||
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
|
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App"/>
|
<PackageReference Include="Microsoft.AspNetCore.App"/>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="${MicrosoftAspNetCoreAuthenticationCookiesPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="${MicrosoftAspNetCoreCookiePolicyPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(RequiresHttps)' == 'True'"/>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,12 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<DebugType Condition="'$(TargetFrameworkOverride)' != ''">full</DebugType>
|
|
||||||
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
|
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -19,27 +17,11 @@
|
||||||
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
|
<None Update="app.db" CopyToOutputDirectory="PreserveNewest" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="${MicrosoftAspNetCoreAuthenticationCookiesPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="${MicrosoftAspNetCoreCookiePolicyPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(RequiresHttps)' == 'True'"/>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="${MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion}" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="${MicrosoftEntityFrameworkCoreSqlitePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' != 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="${MicrosoftEntityFrameworkCoreSqlServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' AND '$(UseLocalDB)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="${MicrosoftEntityFrameworkCoreToolsPackageVersion}" PrivateAssets="All" Condition="'$(IndividualLocalAuth)' == 'True'" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -16,15 +15,8 @@
|
||||||
<Compile Include="Program.fs" />
|
<Compile Include="Program.fs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.CookiePolicy" Version="${MicrosoftAspNetCoreCookiePolicyPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(NoHttps)' != 'True'"/>
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,19 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
|
<UserSecretsId Condition="'$(IndividualAuth)' == 'True' OR '$(OrganizationalAuth)' == 'True'">aspnet-Company.WebApplication1-53bc9b9d-9d6a-45d4-8429-2a2761773502</UserSecretsId>
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' != 'True'">0</WebProject_DirectoryAccessLevelKey>
|
||||||
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
<WebProject_DirectoryAccessLevelKey Condition="'$(OrganizationalAuth)' == 'True' AND '$(OrgReadAccess)' == 'True'">1</WebProject_DirectoryAccessLevelKey>
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADUIPackageVersion}" Condition="'$(OrganizationalAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="${MicrosoftAspNetCoreAuthenticationAzureADB2CUIPackageVersion}" Condition="'$(IndividualB2CAuth)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(RequiresHttps)' == 'True'" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,9 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
<NoDefaultLaunchSettingsFile Condition="'$(ExcludeLaunchSettings)' == 'True'">True</NoDefaultLaunchSettingsFile>
|
||||||
<AspNetCoreHostingModel Condition="'$(TargetFrameworkOverride)' == ''">InProcess</AspNetCoreHostingModel>
|
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
|
@ -14,13 +13,8 @@
|
||||||
<Compile Include="Program.fs" />
|
<Compile Include="Program.fs" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(NoHttps)' != 'True'" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,6 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -86,13 +80,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,6 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -82,13 +76,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": true,
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework",
|
"longName": "framework",
|
||||||
"isHidden": true
|
"isHidden": true
|
||||||
|
|
@ -16,4 +11,3 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
g
|
|
||||||
|
|
@ -21,13 +21,6 @@
|
||||||
"sourceName": "Company.RazorClassLibrary1",
|
"sourceName": "Company.RazorClassLibrary1",
|
||||||
"preferNameDirectory": true,
|
"preferNameDirectory": true,
|
||||||
"symbols": {
|
"symbols": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"UseLocalDB": {
|
"UseLocalDB": {
|
||||||
"longName": "use-local-db"
|
"longName": "use-local-db"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -33,12 +33,6 @@
|
||||||
"wwwroot/**"
|
"wwwroot/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(!OrganizationalAuth && !IndividualAuth)",
|
"condition": "(!OrganizationalAuth && !IndividualAuth)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -310,13 +304,6 @@
|
||||||
"defaultValue": "false",
|
"defaultValue": "false",
|
||||||
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"UseLocalDB": {
|
"UseLocalDB": {
|
||||||
"longName": "use-local-db"
|
"longName": "use-local-db"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -29,12 +29,6 @@
|
||||||
"wwwroot/**"
|
"wwwroot/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(!OrganizationalAuth && !IndividualAuth)",
|
"condition": "(!OrganizationalAuth && !IndividualAuth)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -300,13 +294,6 @@
|
||||||
"defaultValue": "false",
|
"defaultValue": "false",
|
||||||
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -11,11 +11,6 @@
|
||||||
"longName": "exclude-launch-settings",
|
"longName": "exclude-launch-settings",
|
||||||
"shortName": ""
|
"shortName": ""
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,6 @@
|
||||||
"wwwroot/**"
|
"wwwroot/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -87,13 +81,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"UseLocalDB": {
|
"UseLocalDB": {
|
||||||
"longName": "use-local-db"
|
"longName": "use-local-db"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,6 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(windir == 'C:\\Windows')",
|
"condition": "(windir == 'C:\\Windows')",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -209,13 +203,6 @@
|
||||||
"defaultValue": "false",
|
"defaultValue": "false",
|
||||||
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
"description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified."
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -11,11 +11,6 @@
|
||||||
"longName": "exclude-launch-settings",
|
"longName": "exclude-launch-settings",
|
||||||
"shortName": ""
|
"shortName": ""
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -20,12 +20,6 @@
|
||||||
"sources": [
|
"sources": [
|
||||||
{
|
{
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -82,13 +76,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
||||||
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
|
|
@ -15,17 +14,9 @@
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(NoHttps)' != 'True'"/>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="${MicrosoftAspNetCoreSpaServicesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
||||||
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
|
|
@ -12,17 +11,9 @@
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(NoHttps)' != 'True'"/>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="${MicrosoftAspNetCoreSpaServicesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
|
|
||||||
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
|
||||||
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
|
|
@ -12,17 +11,9 @@
|
||||||
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WebApplication1</RootNamespace>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' == ''">
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.App" />
|
<PackageReference Include="Microsoft.AspNetCore.App" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup Condition="'$(TargetFrameworkOverride)' != ''">
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore" Version="${MicrosoftAspNetCorePackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="${MicrosoftAspNetCoreHttpsPolicyPackageVersion}" Condition="'$(NoHttps)' != 'True'"/>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="${MicrosoftAspNetCoreMvcPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="${MicrosoftAspNetCoreSpaServicesPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="${MicrosoftAspNetCoreStaticFilesPackageVersion}" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
<!-- Don't publish the SPA source files, but do show them in the project files list -->
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,6 @@
|
||||||
".template.config/**"
|
".template.config/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -86,13 +80,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,6 @@
|
||||||
".template.config/**"
|
".template.config/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -86,13 +80,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -1,11 +1,6 @@
|
||||||
{
|
{
|
||||||
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
"$schema": "http://json.schemastore.org/dotnetcli.host",
|
||||||
"symbolInfo": {
|
"symbolInfo": {
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"isHidden": "true",
|
|
||||||
"longName": "target-framework-override",
|
|
||||||
"shortName": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"longName": "framework"
|
"longName": "framework"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,12 +24,6 @@
|
||||||
".template.config/**"
|
".template.config/**"
|
||||||
],
|
],
|
||||||
"modifiers": [
|
"modifiers": [
|
||||||
{
|
|
||||||
"condition": "(TargetFrameworkOverride == '')",
|
|
||||||
"exclude": [
|
|
||||||
"app.config"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"condition": "(ExcludeLaunchSettings)",
|
"condition": "(ExcludeLaunchSettings)",
|
||||||
"exclude": [
|
"exclude": [
|
||||||
|
|
@ -86,13 +80,6 @@
|
||||||
},
|
},
|
||||||
"replaces": "44300"
|
"replaces": "44300"
|
||||||
},
|
},
|
||||||
"TargetFrameworkOverride": {
|
|
||||||
"type": "parameter",
|
|
||||||
"description": "Overrides the target framework",
|
|
||||||
"replaces": "TargetFrameworkOverride",
|
|
||||||
"datatype": "string",
|
|
||||||
"defaultValue": ""
|
|
||||||
},
|
|
||||||
"Framework": {
|
"Framework": {
|
||||||
"type": "parameter",
|
"type": "parameter",
|
||||||
"description": "The target framework for the project.",
|
"description": "The target framework for the project.",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8" ?>
|
|
||||||
<configuration>
|
|
||||||
<runtime>
|
|
||||||
<gcServer enabled="true"/>
|
|
||||||
</runtime>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -13,23 +13,14 @@ namespace Templates.Test
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux)]
|
|
||||||
[OSSkipCondition(OperatingSystems.MacOSX)]
|
|
||||||
public void EmptyWebTemplate_Works_NetFramework()
|
|
||||||
=> EmptyWebTemplateImpl("net461");
|
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void EmptyWebTemplate_Works_NetCore()
|
public void EmptyWebTemplate()
|
||||||
=> EmptyWebTemplateImpl(null);
|
|
||||||
|
|
||||||
private void EmptyWebTemplateImpl(string targetFrameworkOverride)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("web", targetFrameworkOverride);
|
RunDotNetNew("web");
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/");
|
aspNetProcess.AssertOk("/");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ namespace Templates.Test.Helpers
|
||||||
private readonly HttpClient _httpClient;
|
private readonly HttpClient _httpClient;
|
||||||
private readonly ITestOutputHelper _output;
|
private readonly ITestOutputHelper _output;
|
||||||
|
|
||||||
public AspNetProcess(ITestOutputHelper output, string workingDirectory, string projectName, string targetFrameworkOverride, bool publish)
|
public AspNetProcess(ITestOutputHelper output, string workingDirectory, string projectName, bool publish)
|
||||||
{
|
{
|
||||||
_output = output;
|
_output = output;
|
||||||
_httpClient = new HttpClient(new HttpClientHandler()
|
_httpClient = new HttpClient(new HttpClientHandler()
|
||||||
|
|
@ -41,7 +41,6 @@ namespace Templates.Test.Helpers
|
||||||
var now = DateTimeOffset.Now;
|
var now = DateTimeOffset.Now;
|
||||||
new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
|
new CertificateManager().EnsureAspNetCoreHttpsDevelopmentCertificate(now, now.AddYears(1));
|
||||||
|
|
||||||
var framework = string.IsNullOrEmpty(targetFrameworkOverride) ? DefaultFramework : targetFrameworkOverride;
|
|
||||||
if (publish)
|
if (publish)
|
||||||
{
|
{
|
||||||
output.WriteLine("Publishing ASP.NET application...");
|
output.WriteLine("Publishing ASP.NET application...");
|
||||||
|
|
@ -53,7 +52,7 @@ namespace Templates.Test.Helpers
|
||||||
ProcessEx
|
ProcessEx
|
||||||
.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"publish -c Release {extraArgs}")
|
.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"publish -c Release {extraArgs}")
|
||||||
.WaitForExit(assertSuccess: true);
|
.WaitForExit(assertSuccess: true);
|
||||||
workingDirectory = Path.Combine(workingDirectory, "bin", "Release", framework, "publish");
|
workingDirectory = Path.Combine(workingDirectory, "bin", "Release", DefaultFramework, "publish");
|
||||||
if (File.Exists(Path.Combine(workingDirectory, "ClientApp", "package.json")))
|
if (File.Exists(Path.Combine(workingDirectory, "ClientApp", "package.json")))
|
||||||
{
|
{
|
||||||
Npm.RestoreWithRetry(output, Path.Combine(workingDirectory, "ClientApp"));
|
Npm.RestoreWithRetry(output, Path.Combine(workingDirectory, "ClientApp"));
|
||||||
|
|
@ -78,24 +77,10 @@ namespace Templates.Test.Helpers
|
||||||
}
|
}
|
||||||
|
|
||||||
output.WriteLine("Running ASP.NET application...");
|
output.WriteLine("Running ASP.NET application...");
|
||||||
if (framework.StartsWith("netcore"))
|
|
||||||
{
|
|
||||||
var dllPath = publish ? $"{projectName}.dll" : $"bin/Debug/{framework}/{projectName}.dll";
|
|
||||||
_process = ProcessEx.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"exec {dllPath}", envVars: envVars);
|
|
||||||
_listeningUri = GetListeningUri(output);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var exeFullPath = publish
|
|
||||||
? Path.Combine(workingDirectory, $"{projectName}.exe")
|
|
||||||
: Path.Combine(workingDirectory, "bin", "Debug", framework, $"{projectName}.exe");
|
|
||||||
using (new AddFirewallExclusion(exeFullPath))
|
|
||||||
{
|
|
||||||
_process = ProcessEx.Run(output, workingDirectory, exeFullPath, envVars: envVars);
|
|
||||||
_listeningUri = GetListeningUri(output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
var dllPath = publish ? $"{projectName}.dll" : $"bin/Debug/{DefaultFramework}/{projectName}.dll";
|
||||||
|
_process = ProcessEx.Run(output, workingDirectory, DotNetMuxer.MuxerPathOrDefault(), $"exec {dllPath}", envVars: envVars);
|
||||||
|
_listeningUri = GetListeningUri(output);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void VisitInBrowser(IWebDriver driver)
|
public void VisitInBrowser(IWebDriver driver)
|
||||||
|
|
|
||||||
|
|
@ -59,17 +59,12 @@ $@"<Project>
|
||||||
File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.targets"), directoryBuildTargetsContent);
|
File.WriteAllText(Path.Combine(TemplateOutputDir, "Directory.Build.targets"), directoryBuildTargetsContent);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void RunDotNetNew(string templateName, string targetFrameworkOverride, string auth = null, string language = null, bool useLocalDB = false, bool noHttps = false)
|
protected void RunDotNetNew(string templateName, string auth = null, string language = null, bool useLocalDB = false, bool noHttps = false)
|
||||||
{
|
{
|
||||||
SetAfterDirectoryBuildPropsContents();
|
SetAfterDirectoryBuildPropsContents();
|
||||||
|
|
||||||
var args = $"new {templateName} --debug:custom-hive \"{TemplatePackageInstaller.CustomHivePath}\"";
|
var args = $"new {templateName} --debug:custom-hive \"{TemplatePackageInstaller.CustomHivePath}\"";
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(targetFrameworkOverride))
|
|
||||||
{
|
|
||||||
args += $" --target-framework-override {targetFrameworkOverride}";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(auth))
|
if (!string.IsNullOrEmpty(auth))
|
||||||
{
|
{
|
||||||
args += $" --auth {auth}";
|
args += $" --auth {auth}";
|
||||||
|
|
@ -214,9 +209,9 @@ $@"<Project>
|
||||||
return File.ReadAllText(Path.Combine(TemplateOutputDir, path));
|
return File.ReadAllText(Path.Combine(TemplateOutputDir, path));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected AspNetProcess StartAspNetProcess(string targetFrameworkOverride, bool publish = false)
|
protected AspNetProcess StartAspNetProcess(bool publish = false)
|
||||||
{
|
{
|
||||||
return new AspNetProcess(Output, TemplateOutputDir, ProjectName, targetFrameworkOverride, publish);
|
return new AspNetProcess(Output, TemplateOutputDir, ProjectName, publish);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
|
|
|
||||||
|
|
@ -13,37 +13,12 @@ namespace Templates.Test
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
[Theory]
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
[InlineData(null)]
|
||||||
public void MvcTemplate_NoAuth_Works_NetFramework_ForDefaultTemplate()
|
[InlineData("F#", Skip = "https://github.com/aspnet/Templating/issues/673")]
|
||||||
=> MvcTemplate_NoAuthImpl("net461", languageOverride: default);
|
private void MvcTemplate_NoAuthImpl(string languageOverride)
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void MvcTemplate_NoAuth_Works_NetFramework_ForFSharpTemplate()
|
|
||||||
=> MvcTemplate_NoAuthImpl("net461", languageOverride: "F#");
|
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void MvcTemplate_NoAuth_NoHttps_Works_NetFramework_ForDefaultTemplate()
|
|
||||||
=> MvcTemplate_NoAuthImpl("net461", languageOverride: default, true);
|
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void MvcTemplate_NoAuth_NoHttps_Works_NetFramework_ForFSharpTemplate()
|
|
||||||
=> MvcTemplate_NoAuthImpl("net461", languageOverride: "F#", true);
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void MvcTemplate_NoAuth_Works_NetCore_ForDefaultTemplate()
|
|
||||||
=> MvcTemplate_NoAuthImpl(null, languageOverride: default);
|
|
||||||
|
|
||||||
[Fact(Skip = "https://github.com/aspnet/Templating/issues/673")]
|
|
||||||
public void MvcTemplate_NoAuth_Works_NetCore_ForFSharpTemplate()
|
|
||||||
=> MvcTemplate_NoAuthImpl(null, languageOverride: "F#");
|
|
||||||
|
|
||||||
private void MvcTemplate_NoAuthImpl(string targetFrameworkOverride, string languageOverride, bool noHttps = false)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("mvc", targetFrameworkOverride, language: languageOverride, noHttps: noHttps);
|
RunDotNetNew("mvc", language: languageOverride);
|
||||||
|
|
||||||
AssertDirectoryExists("Areas", false);
|
AssertDirectoryExists("Areas", false);
|
||||||
AssertDirectoryExists("Extensions", false);
|
AssertDirectoryExists("Extensions", false);
|
||||||
|
|
@ -58,21 +33,9 @@ namespace Templates.Test
|
||||||
Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);
|
Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);
|
||||||
Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents);
|
Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents);
|
||||||
|
|
||||||
if (targetFrameworkOverride != null)
|
|
||||||
{
|
|
||||||
if (noHttps)
|
|
||||||
{
|
|
||||||
Assert.DoesNotContain("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/");
|
aspNetProcess.AssertOk("/");
|
||||||
aspNetProcess.AssertOk("/Home/Privacy");
|
aspNetProcess.AssertOk("/Home/Privacy");
|
||||||
|
|
@ -80,27 +43,12 @@ namespace Templates.Test
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
[Theory]
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
[InlineData(true)]
|
||||||
public void MvcTemplate_IndividualAuth_Works_NetFramework()
|
[InlineData(false)]
|
||||||
=> MvcTemplate_IndividualAuthImpl("net461");
|
public void MvcTemplate_IndividualAuthImpl(bool useLocalDB)
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void MvcTemplate_WithIndividualAuth_NoHttpsSetToTrue_UsesHttps_NetFramework()
|
|
||||||
=> MvcTemplate_IndividualAuthImpl("net461", false, true);
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void MvcTemplate_IndividualAuth_Works_NetCore()
|
|
||||||
=> MvcTemplate_IndividualAuthImpl(null);
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void MvcTemplate_IndividualAuth_UsingLocalDB_Works_NetCore()
|
|
||||||
=> MvcTemplate_IndividualAuthImpl(null, true);
|
|
||||||
|
|
||||||
private void MvcTemplate_IndividualAuthImpl(string targetFrameworkOverride, bool useLocalDB = false, bool noHttps = false)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("mvc", targetFrameworkOverride, auth: "Individual", useLocalDB: useLocalDB);
|
RunDotNetNew("mvc", auth: "Individual", useLocalDB: useLocalDB);
|
||||||
|
|
||||||
AssertDirectoryExists("Extensions", false);
|
AssertDirectoryExists("Extensions", false);
|
||||||
AssertFileExists("urlRewrite.config", false);
|
AssertFileExists("urlRewrite.config", false);
|
||||||
|
|
@ -112,18 +60,13 @@ namespace Templates.Test
|
||||||
Assert.Contains(".db", projectFileContents);
|
Assert.Contains(".db", projectFileContents);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetFrameworkOverride != null)
|
|
||||||
{
|
|
||||||
Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
|
|
||||||
RunDotNetEfCreateMigration("mvc");
|
RunDotNetEfCreateMigration("mvc");
|
||||||
|
|
||||||
AssertEmptyMigration("mvc");
|
AssertEmptyMigration("mvc");
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/");
|
aspNetProcess.AssertOk("/");
|
||||||
aspNetProcess.AssertOk("/Home/Privacy");
|
aspNetProcess.AssertOk("/Home/Privacy");
|
||||||
|
|
|
||||||
|
|
@ -13,23 +13,10 @@ namespace Templates.Test
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void RazorPagesTemplate_NoAuth_Works_NetFramework()
|
|
||||||
=> RazorPagesTemplate_NoAuthImpl("net461");
|
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void RazorPagesTemplate_NoAuth_NoHttps_Works_NetFramework()
|
|
||||||
=> RazorPagesTemplate_NoAuthImpl("net461", true);
|
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void RazorPagesTemplate_NoAuth_Works_NetCore()
|
private void RazorPagesTemplate_NoAuthImpl()
|
||||||
=> RazorPagesTemplate_NoAuthImpl(null);
|
|
||||||
|
|
||||||
private void RazorPagesTemplate_NoAuthImpl(string targetFrameworkOverride, bool noHttps = false)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("razor", targetFrameworkOverride, noHttps: noHttps);
|
RunDotNetNew("razor");
|
||||||
|
|
||||||
AssertFileExists("Pages/Shared/_LoginPartial.cshtml", false);
|
AssertFileExists("Pages/Shared/_LoginPartial.cshtml", false);
|
||||||
|
|
||||||
|
|
@ -40,21 +27,9 @@ namespace Templates.Test
|
||||||
Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);
|
Assert.DoesNotContain("Microsoft.EntityFrameworkCore.Tools.DotNet", projectFileContents);
|
||||||
Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents);
|
Assert.DoesNotContain("Microsoft.Extensions.SecretManager.Tools", projectFileContents);
|
||||||
|
|
||||||
if (targetFrameworkOverride != null)
|
|
||||||
{
|
|
||||||
if (noHttps)
|
|
||||||
{
|
|
||||||
Assert.DoesNotContain("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/");
|
aspNetProcess.AssertOk("/");
|
||||||
aspNetProcess.AssertOk("/Privacy");
|
aspNetProcess.AssertOk("/Privacy");
|
||||||
|
|
@ -62,27 +37,12 @@ namespace Templates.Test
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
[Theory]
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
[InlineData(false)]
|
||||||
public void RazorPagesTemplate_IndividualAuth_Works_NetFramework()
|
[InlineData(true)]
|
||||||
=> RazorPagesTemplate_IndividualAuthImpl("net461");
|
public void RazorPagesTemplate_IndividualAuthImpl( bool useLocalDB)
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void RazorPagesTemplate_WithIndividualAuth_NoHttpsSetToTrue_UsesHttps_NetFramework()
|
|
||||||
=> RazorPagesTemplate_IndividualAuthImpl("net461", false, true);
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void RazorPagesTemplate_IndividualAuth_Works_NetCore()
|
|
||||||
=> RazorPagesTemplate_IndividualAuthImpl(null);
|
|
||||||
|
|
||||||
[Fact]
|
|
||||||
public void RazorPagesTemplate_IndividualAuth_UsingLocalDB_Works_NetCore()
|
|
||||||
=> RazorPagesTemplate_IndividualAuthImpl(null, true);
|
|
||||||
|
|
||||||
private void RazorPagesTemplate_IndividualAuthImpl(string targetFrameworkOverride, bool useLocalDB = false, bool noHttps = false)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("razor", targetFrameworkOverride, auth: "Individual", useLocalDB: useLocalDB);
|
RunDotNetNew("razor", auth: "Individual", useLocalDB: useLocalDB);
|
||||||
|
|
||||||
AssertFileExists("Pages/Shared/_LoginPartial.cshtml", true);
|
AssertFileExists("Pages/Shared/_LoginPartial.cshtml", true);
|
||||||
|
|
||||||
|
|
@ -92,18 +52,13 @@ namespace Templates.Test
|
||||||
Assert.Contains(".db", projectFileContents);
|
Assert.Contains(".db", projectFileContents);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (targetFrameworkOverride != null)
|
|
||||||
{
|
|
||||||
Assert.Contains("Microsoft.AspNetCore.HttpsPolicy", projectFileContents);
|
|
||||||
}
|
|
||||||
|
|
||||||
RunDotNetEfCreateMigration("razorpages");
|
RunDotNetEfCreateMigration("razorpages");
|
||||||
|
|
||||||
AssertEmptyMigration("razorpages");
|
AssertEmptyMigration("razorpages");
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/");
|
aspNetProcess.AssertOk("/");
|
||||||
aspNetProcess.AssertOk("/Privacy");
|
aspNetProcess.AssertOk("/Privacy");
|
||||||
|
|
|
||||||
|
|
@ -15,20 +15,8 @@ namespace Templates.Test.SpaTemplateTest
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
// Just use 'angular' as representative for .NET 4.6.1 coverage, as
|
|
||||||
// the client-side code isn't affected by the .NET runtime choice
|
|
||||||
public void AngularTemplate_Works_NetFramework()
|
|
||||||
=> SpaTemplateImpl("net461", "angular");
|
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
|
|
||||||
public void AngularTemplate_NoHttps_Works_NetFramework()
|
|
||||||
=> SpaTemplateImpl("net461", "angular", true);
|
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void AngularTemplate_Works_NetCore()
|
public void AngularTemplate_Works()
|
||||||
=> SpaTemplateImpl(null, "angular");
|
=> SpaTemplateImpl("angular");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ namespace Templates.Test.SpaTemplateTest
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void ReactReduxTemplate_Works_NetCore()
|
public void ReactReduxTemplate_Works_NetCore()
|
||||||
=> SpaTemplateImpl(null, "reactredux");
|
=> SpaTemplateImpl("reactredux");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,6 @@ namespace Templates.Test.SpaTemplateTest
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void ReactTemplate_Works_NetCore()
|
public void ReactTemplate_Works_NetCore()
|
||||||
=> SpaTemplateImpl(null, "react");
|
=> SpaTemplateImpl("react");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,9 @@ namespace Templates.Test.SpaTemplateTest
|
||||||
// Rather than using [Theory] to pass each of the different values for 'template',
|
// Rather than using [Theory] to pass each of the different values for 'template',
|
||||||
// it's important to distribute the SPA template tests over different test classes
|
// it's important to distribute the SPA template tests over different test classes
|
||||||
// so they can be run in parallel. Xunit doesn't parallelize within a test class.
|
// so they can be run in parallel. Xunit doesn't parallelize within a test class.
|
||||||
protected void SpaTemplateImpl(string targetFrameworkOverride, string template, bool noHttps = false)
|
protected void SpaTemplateImpl(string template, bool noHttps = false)
|
||||||
{
|
{
|
||||||
RunDotNetNew(template, targetFrameworkOverride, noHttps: noHttps);
|
RunDotNetNew(template, noHttps: noHttps);
|
||||||
|
|
||||||
// For some SPA templates, the NPM root directory is './ClientApp'. In other
|
// For some SPA templates, the NPM root directory is './ClientApp'. In other
|
||||||
// templates it's at the project root. Strictly speaking we shouldn't have
|
// templates it's at the project root. Strictly speaking we shouldn't have
|
||||||
|
|
@ -41,13 +41,13 @@ namespace Templates.Test.SpaTemplateTest
|
||||||
Npm.RestoreWithRetry(Output, clientAppSubdirPath);
|
Npm.RestoreWithRetry(Output, clientAppSubdirPath);
|
||||||
Npm.Test(Output, clientAppSubdirPath);
|
Npm.Test(Output, clientAppSubdirPath);
|
||||||
|
|
||||||
TestApplication(targetFrameworkOverride, publish: false);
|
TestApplication(publish: false);
|
||||||
TestApplication(targetFrameworkOverride, publish: true);
|
TestApplication(publish: true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TestApplication(string targetFrameworkOverride, bool publish)
|
private void TestApplication(bool publish)
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
|
aspNetProcess.AssertStatusCode("/", HttpStatusCode.OK, "text/html");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,6 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||||
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
|
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>
|
||||||
|
|
||||||
<!-- Workaround until https://github.com/aspnet/Common/pull/385 is done -->
|
|
||||||
<DefineConstants>$(DefineConstants);NETCOREAPP2_2</DefineConstants>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
// Copyright (c) .NET Foundation. All rights reserved.
|
// 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.
|
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Testing.xunit;
|
|
||||||
using Xunit;
|
using Xunit;
|
||||||
using Xunit.Abstractions;
|
using Xunit.Abstractions;
|
||||||
|
|
||||||
|
|
@ -13,23 +12,14 @@ namespace Templates.Test
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
[ConditionalFact]
|
|
||||||
[OSSkipCondition(OperatingSystems.Linux)]
|
|
||||||
[OSSkipCondition(OperatingSystems.MacOSX)]
|
|
||||||
public void WebApiTemplate_Works_NetFramework()
|
|
||||||
=> WebApiTemplateImpl("net461");
|
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void WebApiTemplate_Works_NetCore()
|
public void WebApiTemplate()
|
||||||
=> WebApiTemplateImpl(null);
|
|
||||||
|
|
||||||
private void WebApiTemplateImpl(string targetFrameworkOverride)
|
|
||||||
{
|
{
|
||||||
RunDotNetNew("webapi", targetFrameworkOverride);
|
RunDotNetNew("webapi");
|
||||||
|
|
||||||
foreach (var publish in new[] { false, true })
|
foreach (var publish in new[] { false, true })
|
||||||
{
|
{
|
||||||
using (var aspNetProcess = StartAspNetProcess(targetFrameworkOverride, publish))
|
using (var aspNetProcess = StartAspNetProcess(publish))
|
||||||
{
|
{
|
||||||
aspNetProcess.AssertOk("/api/values");
|
aspNetProcess.AssertOk("/api/values");
|
||||||
aspNetProcess.AssertNotFound("/");
|
aspNetProcess.AssertNotFound("/");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue