dotnet · deepchoudhery · May 12, 2023 · May 8, 2023 · May 9, 2023 · May 9, 2023
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,11 +22,4 @@
     <Product>Microsoft ASP.NET Core</Product>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Private.Uri" Version="$(SystemPrivateUriVersion)" />
-    <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="$(SystemSecurityCryptographyX509CertificatesVersion)"/>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManager)"/>
-    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -17,32 +17,10 @@
     <MicrosoftEntityFrameworkCorePackageVersion>7.0.6</MicrosoftEntityFrameworkCorePackageVersion>
     <!-- Microsoft.EntityFrameworkCore.SqlServer -->
     <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>7.0.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>
-    </MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    </MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
     <!-- Microsoft.Extensions.Identity.Stores -->
     <MicrosoftExtensionsIdentityStoresPackageVersion>7.0.6</MicrosoftExtensionsIdentityStoresPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    </MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    </MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>
-    </MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    </MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>
-    </MicrosoftExtensionsDependencyModelPackageVersion>
     <!-- Microsoft.Extensions.FileProviders.Embedded -->
     <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>7.0.6</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>
-    </MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>
-    </MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>
-    </MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    </MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
     <!-- Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore -->
     <MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>7.0.6</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
     <!-- Microsoft.AspNetCore.Identity.EntityFrameworkCore -->
@@ -51,7 +29,7 @@
     <MicrosoftAspNetCoreIdentityUIPackageVersion>7.0.6</MicrosoftAspNetCoreIdentityUIPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>7.0.6</VersionPrefix>
+    <VersionPrefix>7.0.7</VersionPrefix>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <IncludeSourceRevisionInInformationalVersion>False</IncludeSourceRevisionInInformationalVersion>
     <IsServicingBuild Condition="'$(PreReleaseVersionLabel)' == 'servicing'">true</IsServicingBuild>
@@ -83,6 +61,7 @@
     <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>7.0.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
     <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
     <NuGetPackagingVersion>6.3.1</NuGetPackagingVersion>
+    <HumanizerPackageVersion>2.14.1</HumanizerPackageVersion>
     <!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
     <!-- Everything below here are Packages only used by test projects -->
     <!-- Microsoft.AspNetCore.Server.Kestrel -->
@@ -135,12 +114,7 @@
     <XunitExtensibilityExecutionPackageVersion>2.4.2</XunitExtensibilityExecutionPackageVersion>
     <XunitRunnerVisualStudioPackageVersion>2.4.2</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
-    <SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
-    <SystemSecurityCryptographyX509CertificatesVersion>4.3.0</SystemSecurityCryptographyX509CertificatesVersion>
-    <SystemConfigurationConfigurationManager>6.0.0</SystemConfigurationConfigurationManager>
-  </PropertyGroup>
+
   <!-- Package versions for MSIdentity projects-->
   <PropertyGroup>
     <AzureIdentityVersion>1.5.0</AzureIdentityVersion>

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApi.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApi.cshtml
@@ -6,7 +6,8 @@
     string routePrefix = "/api/" + modelName;
     string endPointsClassName = Model.EndpointsName;
     string methodName = $"Map{@modelName}Endpoints";
-    string pluralModel = $"{@modelName}s";
+    string pluralModel = Model.ModelType.PluralName;
+    string routePrefixPlural = "/api/" + pluralModel;
     string getAllModels = $"GetAll{@pluralModel}";
     string getModelById = $"Get{@modelName}ById";
     string deleteModel = $"Delete{@modelName}";
@@ -94,11 +95,11 @@ public static class @endPointsClassName
         @{
         if(!Model.UseTypedResults)
         {
-            @://return Results.Created($"/@pluralModel/{model.ID}", model);
+            @://return Results.Created($"@routePrefixPlural/{model.ID}", model);
         }
         else
         {
-            @://return TypedResults.Created($"/@pluralModel/{model.ID}", model);
+            @://return TypedResults.Created($"@routePrefixPlural/{model.ID}", model);
         }
         }
         })

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiEf.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiEf.cshtml
@@ -5,7 +5,7 @@
     string routePrefix = "/api/" + modelName;
     string endPointsClassName = Model.EndpointsName;
     string methodName = $"Map{@modelName}Endpoints";
-    string pluralModel = $"{@modelName}s";
+    string pluralModel = Model.ModelType.PluralName;
     string getAllModels = $"GetAll{@pluralModel}";
     string getModelById = $"Get{@modelName}ById";
     string deleteModel = $"Delete{@modelName}";

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiEfNoClass.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiEfNoClass.cshtml
@@ -4,7 +4,7 @@
     string routePrefix = "/api/" + modelName;
     string endPointsClassName = Model.EndpointsName;
     string methodName = $"Map{@modelName}Endpoints";
-    string pluralModel = $"{@modelName}s";
+    string pluralModel = Model.ModelType.PluralName;
     string getAllModels = $"GetAll{@pluralModel}";
     string getModelById = $"Get{@modelName}ById";
     string deleteModel = $"Delete{@modelName}";

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiNoClass.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/MinimalApi/MinimalApiNoClass.cshtml
@@ -6,7 +6,8 @@
     string routePrefix = "/api/" + modelName;
     string endPointsClassName = Model.EndpointsName;
     string methodName = $"Map{@modelName}Endpoints";
-    string pluralModel = $"{@modelName}s";
+    string pluralModel = Model.ModelType.PluralName;
+    string routePrefixPlural = "/api/" + pluralModel;
     string getAllModels = $"GetAll{@pluralModel}";
     string getModelById = $"Get{@modelName}ById";
     string deleteModel = $"Delete{@modelName}";
@@ -85,11 +86,11 @@
         @{
         if(!Model.UseTypedResults)
         {
-            @://return Results.Created($"/@pluralModel/{model.ID}", model);
+            @://return Results.Created($"@routePrefixPlural/{model.ID}", model);
         }
         else
         {
-            @://return TypedResults.Created($"/@pluralModel/{model.ID}", model);
+            @://return TypedResults.Created($"@routePrefixPlural/{model.ID}", model);
         }
         }
         })

diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Microsoft.DotNet.Scaffolding.Shared.csproj b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Microsoft.DotNet.Scaffolding.Shared.csproj
@@ -16,17 +16,10 @@
   <!-- Packages for CodeAnalysis code changes-->
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(CodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(CodeAnalysisVersion)" />
-
-
+    <PackageReference Include="Humanizer" Version="$(HumanizerPackageVersion)" />
     <PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Compile Update="MessageStrings.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -41,5 +34,5 @@
       <LastGenOutput>MessageStrings.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ModelType.cs b/src/Shared/Microsoft.DotNet.Scaffolding.Shared/Project/ModelType.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
+using Humanizer;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.DotNet.Scaffolding.Shared.Project
@@ -14,6 +15,7 @@ public class ModelType
 
         public string FullName { get; set; }
 
+        public string PluralName => Name?.Pluralize(inputIsKnownToBeSingular: false);
         // Violating the principle that ModelType should be decoupled from Roslyn's API.
         // I had to do this for editing DbContext scenarios but I need to figure out if there
         // is a better way.

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -11,7 +11,6 @@
     <PackageReference Include="xunit.extensibility.execution" Version="$(XunitExtensibilityExecutionPackageVersion)" />
     <PackageReference Include="xunit.skippablefact" Version="$(XunitSkippableFactPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
-    <PackageReference Include="System.Net.Http" Version="$(SystemNetHttpVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/Scaffolding/Shared/MSBuildProjectStrings.cs b/test/Scaffolding/Shared/MSBuildProjectStrings.cs
@@ -895,7 +895,7 @@ public static IWebHost BuildWebHost(string[] args) =>
   <Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
   <PropertyGroup>
     <RestoreSources>
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
     </RestoreSources>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -905,13 +905,13 @@ public static IWebHost BuildWebHost(string[] args) =>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
-    <PackageReference Include=""Microsoft.EntityFrameworkCore.Design"" Version=""7.0.0-preview.1.22076.6"">
+    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6""/>
+    <PackageReference Include=""Microsoft.EntityFrameworkCore.Design"" Version=""7.0.5""/>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include = ""Microsoft.EntityFrameworkCore.SqlServer"" Version=""7.0.0-preview.1.22076.6"" />
-    <PackageReference Include = ""Microsoft.EntityFrameworkCore.Tools"" Version=""7.0.0-preview.1.22076.6"">
+    <PackageReference Include = ""Microsoft.EntityFrameworkCore.SqlServer"" Version=""7.0.5""/>
+    <PackageReference Include = ""Microsoft.EntityFrameworkCore.Tools"" Version=""7.0.5"">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -923,7 +923,7 @@ public static IWebHost BuildWebHost(string[] args) =>
   <Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
   <PropertyGroup>
     <RestoreSources>
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
     </RestoreSources>
     <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Microsoft.Test</RootNamespace>
@@ -932,7 +932,7 @@ public static IWebHost BuildWebHost(string[] args) =>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
+    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6"" />
   </ItemGroup>
 </Project>
 ";
@@ -942,15 +942,15 @@ public static IWebHost BuildWebHost(string[] args) =>
   <Import Project=""$(MSBuildThisFileDirectory)\TestCodeGeneration.targets"" />
   <PropertyGroup>
     <RestoreSources>
-      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json;
     </RestoreSources>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.0-rtm.22528.4"" />
+    <PackageReference Include=""Microsoft.VisualStudio.Web.CodeGeneration.Design"" Version=""7.0.6"" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include=""..\Library\Library.csproj"" />

diff --git a/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj b/test/Scaffolding/VS.Web.CG.MSBuild.Test/VS.Web.CG.MSBuild.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <Import Project="$(RepoRoot)test\Scaffolding\TestPackage.props" />
 
   <PropertyGroup>
@@ -22,9 +22,10 @@
       <Link>MsBuildSources\%(RecursiveDir)%(FileName)</Link>
     </Compile>
   </ItemGroup>
- 
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Runtime" Version="$(MicrosoftBuildRuntimePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
+    <PackageReference Include="NuGet.Packaging" Version="$(NuGetPackagingVersion)" />
   </ItemGroup>
 </Project>
diff --git a/tools/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj b/tools/dotnet-aspnet-codegenerator/dotnet-aspnet-codegenerator.csproj
@@ -27,7 +27,6 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion)" />
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftExtensionsFileProvidersPhysicalPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
   </ItemGroup>