dotnet
/
Scaffolding
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

initial 7.0-preview1 + minor indent fix (#1826) 

* initial 7.0-preview1 + minor indent fix

* updating ShortTfmDictionary for net7.0
This commit is contained in:
Deep Choudhery 2022-02-16 00:08:28 -08:00 коммит произвёл GitHub
Родитель e2603d6b70
Коммит 6333d22b9e
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 41 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
NuGet.config
Просмотреть файл

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
<add key="dotnet-6-rtm" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rtm.21524.1-shipping/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>

42
eng/Versions.props
Просмотреть файл

@ -41,11 +41,11 @@
<!-- Microsoft.Extensions.CommandLineUtils.Sources -->
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>6.0.0-preview.3.21166.3</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
<!-- Microsoft.EntityFrameworkCore.Design -->
<MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<MicrosoftEntityFrameworkCoreDesignPackageVersion>7.0.0-preview.1.22076.6</MicrosoftEntityFrameworkCoreDesignPackageVersion>
<!-- Microsoft.Extensions.DependencyInjection -->
<MicrosoftExtensionsDependencyInjectionPackageVersion>6.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsDependencyInjectionPackageVersion>
<!-- Microsoft.Extensions.FileProviders.Physical -->
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>6.0.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- Everything below here are Packages only used by test projects -->
@ -56,13 +56,13 @@
<!-- Microsoft.ApplicationInsights.AspNetCore -->
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.18.0</MicrosoftApplicationInsightsAspNetCorePackageVersion>
<!-- Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore -->
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>6.0.0</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>7.0.0-preview.1.22076.6</MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion>
<!-- Microsoft.AspNetCore.Identity.EntityFrameworkCore -->
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>6.0.0</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>7.0.0-preview.1.22076.6</MicrosoftAspNetCoreIdentityEntityFrameworkCorePackageVersion>
<!-- Microsoft.AspNetCore.Identity.UI -->
<MicrosoftAspNetCoreIdentityUIPackageVersion>6.0.0</MicrosoftAspNetCoreIdentityUIPackageVersion>
<MicrosoftAspNetCoreIdentityUIPackageVersion>7.0.0-preview.1.22076.6</MicrosoftAspNetCoreIdentityUIPackageVersion>
<!-- Microsoft.Extensions.Identity.Stores -->
<MicrosoftExtensionsIdentityStoresPackageVersion>6.0.0</MicrosoftExtensionsIdentityStoresPackageVersion>
<MicrosoftExtensionsIdentityStoresPackageVersion>7.0.0-preview.1.22081.6</MicrosoftExtensionsIdentityStoresPackageVersion>
<!-- Microsoft.AspNetCore -->
<!-- this is from aspnetcore-dev (test project only) -->
<MicrosoftAspNetCorePackageVersion>6.0.0</MicrosoftAspNetCorePackageVersion>
@ -79,31 +79,31 @@
<!-- Microsoft.DotNet.ProjectModel -->
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
<!-- Microsoft.EntityFrameworkCore -->
<MicrosoftEntityFrameworkCorePackageVersion>6.0.0</MicrosoftEntityFrameworkCorePackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>7.0.0-preview.1.22076.6</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Microsoft.EntityFramework.Design for test-->
<MicrosoftEntityFrameworkCoreDesignTestPackageVersion>6.0.0</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
<MicrosoftEntityFrameworkCoreDesignTestPackageVersion>7.0.0-preview.1.22076.6</MicrosoftEntityFrameworkCoreDesignTestPackageVersion>
<!-- Microsoft.EntityFrameworkCore.SqlServer -->
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>7.0.0-preview.1.22076.6</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<!-- Microsoft.Extensions.Configuration.Abstractions -->
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<!-- Microsoft.Extensions.Configuration.EnvironmentVariables -->
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>6.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<!-- Microsoft.Extensions.Configuration.Json -->
<MicrosoftExtensionsConfigurationJsonPackageVersion>6.0.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsConfigurationJsonPackageVersion>
<!-- Microsoft.Extensions.Configuration.UserSecrets -->
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>6.0.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<!--Microsoft.Extensions.DependencyMoel -->
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsDependencyModelPackageVersion>
<!-- Microsoft.Extensions.FileProviders.Embedded -->
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>6.0.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>7.0.0-preview.1.22081.6</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
<!-- Microsoft.Extensions.Logging.Console -->
<MicrosoftExtensionsLoggingConsolePackageVersion>6.0.0</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsLoggingConsolePackageVersion>
<!-- Microsoft.Extensions.Logging.Debug -->
<MicrosoftExtensionsLoggingDebugPackageVersion>6.0.0</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsLoggingDebugPackageVersion>
<!-- Microsoft.Extensions.Logging -->
<MicrosoftExtensionsLoggingPackageVersion>6.0.0</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsLoggingPackageVersion>
<!-- Microsoft.Extensions.Options.ConfigurationExtensions -->
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>6.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>7.0.0-preview.1.22076.8</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<!-- Microsoft.NET.Sdk.Razor -->
<MicrosoftNETSdkRazorPackageVersion>5.0.0-preview.6.20312.15</MicrosoftNETSdkRazorPackageVersion>
<!-- Microsoft.NET.Test.Sdk-->
@ -116,7 +116,7 @@
<XunitRunnerVisualStudioPackageVersion>2.4.2-pre.9</XunitRunnerVisualStudioPackageVersion>
</PropertyGroup>
<PropertyGroup>
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
<SystemCollectionsImmutableVersion>7.0.0-preview.1.22076.8</SystemCollectionsImmutableVersion>
<SystemNetHttpVersion>4.3.4</SystemNetHttpVersion>
<SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
</PropertyGroup>

2
scripts/install-aspnet-codegenerator.cmd
Просмотреть файл

@ -1,4 +1,4 @@
set VERSION=6.0.2
set VERSION=7.0.0-dev
set DEFAULT_NUPKG_PATH=%userprofile%\.nuget\packages
set SRC_DIR=%cd%
set NUPKG=artifacts/packages/Debug/Shipping/

2
src/MSIdentityScaffolding/Microsoft.DotNet.MSIdentity/Microsoft.DotNet.MSIdentity.csproj
Просмотреть файл

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<Nullable>enable</Nullable>
<RootNamespace>Microsoft.DotNet.MSIdentity</RootNamespace>
<OutputType>Library</OutputType>

10
src/Scaffolding/VS.Web.CG.Mvc/Identity/identityMinimalHostingChanges.json
Просмотреть файл

@ -12,12 +12,18 @@
},
{
"InsertAfter": "builder.Configuration.GetConnectionString",
"Block": "builder.Services.AddDbContext<{0}>(options =>\r\n options.{0}(connectionString));\""
"Block": "builder.Services.AddDbContext<{0}>(options =>\r\n options.{0}(connectionString));\"",
"CodeFormatting": {
"Newline": true
}
},
{
"InsertAfter": "builder.Services.AddDbContext",
"CheckBlock": "builder.Services.AddDefaultIdentity",
"Block": "builder.Services.AddDefaultIdentity<{0}>(options => options.SignIn.RequireConfirmedAccount = true)\r\n .AddEntityFrameworkStores<{0}>();\""
"Block": "builder.Services.AddDefaultIdentity<{0}>(options => options.SignIn.RequireConfirmedAccount = true)\r\n .AddEntityFrameworkStores<{0}>();\"",
"CodeFormatting": {
"Newline": true
}
},
{
"InsertAfter": "app.UseRouting();",

4
src/Shared/Microsoft.DotNet.Scaffolding.Shared/MessageStrings.Designer.cs сгенерированный
Просмотреть файл

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Scaffolding.Shared {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class MessageStrings {
@ -158,5 +158,5 @@ namespace Microsoft.DotNet.Scaffolding.Shared {
return ResourceManager.GetString("StartFileSystemChangeToken", resourceCulture);
}
}
}
}
}

4
src/Shared/Microsoft.DotNet.Scaffolding.Shared/Microsoft.DotNet.Scaffolding.Shared.csproj
Просмотреть файл

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.1; net5.0; net6.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<AssemblyName>Microsoft.DotNet.Scaffolding.Shared</AssemblyName>
<RootNamespace>Microsoft.DotNet.Scaffolding.Shared</RootNamespace>
<Description>Contains interfaces for Project Model and messaging for scaffolding.</Description>
@ -24,7 +24,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(CodeAnalysisVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelVersion)" />
</ItemGroup>

3
src/Shared/Microsoft.DotNet.Scaffolding.Shared/ProjectModel/ProjectModelHelper.cs
Просмотреть файл

@ -32,7 +32,8 @@ namespace Microsoft.DotNet.Scaffolding.Shared.ProjectModel
{ ".NETCoreApp,Version=v3.1", "netcoreapp3.1" },
{ ".NETCoreApp,Version=v5.0", "net5.0" },
{ ".NETCoreApp,Version=v6.0", "net6.0" },
{ ".NETCoreApp,Version=v2.1", "netcoreapp2.1" }
{ ".NETCoreApp,Version=v2.1", "netcoreapp2.1" },
{ ".NETCoreApp,Version=v7.0", "net7.0" }
};
}
}

2
tools/dotnet-msidentity/dotnet-msidentity.csproj
Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>net6.0</TargetFrameworks>
<Nullable>enable</Nullable>
<RootNamespace>Microsoft.DotNet.MSIdentity</RootNamespace>
<SignAssembly>true</SignAssembly>