Merging release/3.1 based branch into master (#1164)
* props updates for 3.1.0
* updated one more package and versions
* update feed file
* updated props
* Update Resources.resx
* Update Account.Login.cs.cshtml
* Update Account.Login.cs.cshtml
* 3.1 cleanup resend email
* Scaffolding Arcade Migration (#1118)
Migration for arcade build.
* updated versions
* using netcore 3.1 preview1
* Update _Layout.cshtml
* Update _Layout.cshtml
* adding dependency for arcade
* fixed casing for Microsoft.NET.Sdk
* updating arcade version to test
* updating 3.1.0 preview 1 to 2.
* upgraded all 3.0 to 3.1 for tfm, except global
* reverting to 3.1 p1
* updated more packages to preview2
* Fixing the package graph
* Removing the package icon
* Update dependencies from https://github.com/dotnet/arcade build 20191105.5
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19555.5
* Adding the dotnetcore-tools feed
* Scaffolding - Fix account confirmation for social logins (#1133)
* update 3.1 packages to preview3
* Revert "update 3.1 packages to preview3"
This reverts commit bfc83f026d.
* updating dotnet31 to preview 3
* more updates for preview3
* Update dependencies from https://github.com/dotnet/arcade build 20191111.9
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19561.9
* updated nuget.config
* Update 3.1 to GA (#1158)
* update packages to GA
* set StabilizePackageVersion to true
* changed prerelease to rtm
* Update dependencies from https://github.com/dotnet/arcade build 20191114.3 (#1162)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19564.3
* minor updates
* changing stabilize to false
This commit is contained in:
deepchoudhery
GitHub
Родитель
6464bae77b
Коммит
0d4010adbd
|
|
@ -6,6 +6,7 @@
|
|||
<Copyright>$(CopyrightMicrosoft)</Copyright>
|
||||
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
|
||||
<IsPackable>true</IsPackable>
|
||||
<IncludeSymbols>true</IncludeSymbols>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<DebugSymbol>true</DebugSymbol>
|
||||
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,6 @@
|
|||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="aspnet-aspnetcore-dev" value="https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json" />
|
||||
<add key="aspnet-aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
|
||||
<add key="3dot1" value="https://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-preview3-014645/index.json" />
|
||||
<add key="3dot1" value="https://dotnetfeed.blob.core.windows.net/dotnet-core-3-1-ga-014709/index.json" />
|
||||
</packageSources>
|
||||
</configuration>
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
<PropertyGroup>
|
||||
<VersionPrefix>5.0.0</VersionPrefix>
|
||||
<PreReleaseVersionLabel>alpha1</PreReleaseVersionLabel>
|
||||
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<RestoreSources>
|
||||
|
|
@ -27,33 +28,30 @@
|
|||
</RestoreSources>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- adding packages from old dependencies.prop file-->
|
||||
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.3.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
|
||||
<!-- Microsoft.AspNetCore.Razor.Language -->
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.0-preview3.19553.1</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.1.0</MicrosoftAspNetCoreRazorLanguagePackageVersion>
|
||||
<!-- Microsoft.AspNetCore.Razor.Runtime -->
|
||||
<MicrosoftAspNetCoreRazorRuntimePackageVersion>2.2.0</MicrosoftAspNetCoreRazorRuntimePackageVersion>
|
||||
<MicrosoftBuildPackageVersion>15.6.82</MicrosoftBuildPackageVersion>
|
||||
<MicrosoftBuildUtilitiesCorePackageVersion>15.6.82</MicrosoftBuildUtilitiesCorePackageVersion>
|
||||
<!-- Microsoft.CodeAnalysis.CSharp -->
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0-beta3-19554-06</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0-beta4-19562-01</MicrosoftCodeAnalysisCSharpPackageVersion>
|
||||
<!-- Microsoft.CodeAnalysis.Razor -->
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>3.1.0-preview3.19553.1</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<MicrosoftCodeAnalysisRazorPackageVersion>3.1.0</MicrosoftCodeAnalysisRazorPackageVersion>
|
||||
<!-- Microsoft.CodeAnalysis.CSharp.Workspaces -->
|
||||
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0-beta3-19554-06</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
|
||||
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0-beta4-19562-01</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
|
||||
<!-- Microsoft.Extensions.CommandLineUtils.Sources -->
|
||||
<!-- from aspnetcore-dev -->
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-preview6.19253.5</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>3.0.0-rc1.19456.10</MicrosoftExtensionsCommandLineUtilsSourcesPackageVersion>
|
||||
<!-- Microsoft.EntityFrameworkCore.Design -->
|
||||
<MicrosoftEntityFrameworkCoreDesignPackageVersion>3.0.0-preview6.19304.10</MicrosoftEntityFrameworkCoreDesignPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreDesignPackageVersion>3.1.0</MicrosoftEntityFrameworkCoreDesignPackageVersion>
|
||||
<!-- Microsoft.Extensions.DependencyInjection -->
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<MicrosoftExtensionsDependencyInjectionPackageVersion>3.1.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
|
||||
<!-- Microsoft.Extensions.FileProviders.Physical -->
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>3.1.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
|
||||
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
|
||||
<NuGetFrameworksPackageVersion>4.7.0</NuGetFrameworksPackageVersion>
|
||||
<VisualStudio_NewtonsoftJsonPackageVersion>9.0.1</VisualStudio_NewtonsoftJsonPackageVersion>
|
||||
<SystemCollectionsImmutablePackageVersion>1.6.0</SystemCollectionsImmutablePackageVersion>
|
||||
<SystemCollectionsImmutablePackageVersion>1.7.0</SystemCollectionsImmutablePackageVersion>
|
||||
<!-- Everything below here are Packages only used by test projects -->
|
||||
<!-- Microsoft.AspNetCore.Hosting -->
|
||||
<MicrosoftAspNetCoreHostingPackageVersion>3.0.0-preview4-19123-01</MicrosoftAspNetCoreHostingPackageVersion>
|
||||
|
|
@ -70,7 +68,7 @@
|
|||
<!-- Microsoft.AspNetCore.Identity.UI -->
|
||||
<MicrosoftAspNetCoreIdentityUIPackageVersion>3.0.0</MicrosoftAspNetCoreIdentityUIPackageVersion>
|
||||
<!-- Microsoft.Extensions.Identity.Stores -->
|
||||
<MicrosoftExtensionsIdentityStoresPackageVersion>3.0.0</MicrosoftExtensionsIdentityStoresPackageVersion>
|
||||
<MicrosoftExtensionsIdentityStoresPackageVersion>3.1.0</MicrosoftExtensionsIdentityStoresPackageVersion>
|
||||
<!-- Microsoft.AspNetCore -->
|
||||
<!-- this is from aspnetcore-dev (test project only) -->
|
||||
<MicrosoftAspNetCorePackageVersion>3.0.0-alpha1-10584</MicrosoftAspNetCorePackageVersion>
|
||||
|
|
@ -87,31 +85,31 @@
|
|||
<!-- Microsoft.DotNet.ProjectModel -->
|
||||
<MicrosoftDotNetProjectModelPackageVersion>1.0.0-rc3-003121</MicrosoftDotNetProjectModelPackageVersion>
|
||||
<!-- Microsoft.EntityFrameworkCore -->
|
||||
<MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview6.19304.10</MicrosoftEntityFrameworkCorePackageVersion>
|
||||
<MicrosoftEntityFrameworkCorePackageVersion>3.1.0</MicrosoftEntityFrameworkCorePackageVersion>
|
||||
<!-- Microsoft.EntityFrameworkCore.SqlServer -->
|
||||
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview5.19227.1</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
|
||||
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.1.0</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
|
||||
<!-- Microsoft.Extensions.Configuration.Abstractions -->
|
||||
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>3.1.0</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
|
||||
<!-- Microsoft.Extensions.Configuration.EnvironmentVariables -->
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.1.0</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
|
||||
<!-- Microsoft.Extensions.Configuration.Json -->
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationJsonPackageVersion>3.1.0</MicrosoftExtensionsConfigurationJsonPackageVersion>
|
||||
<!-- Microsoft.Extensions.Configuration.UserSecrets -->
|
||||
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
|
||||
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.1.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
|
||||
<!--Microsoft.Extensions.DependencyModel -->
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
|
||||
<!-- Microsoft.Extensions.FileProviders.Embedded -->
|
||||
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
|
||||
<MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.1.0</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
|
||||
<!-- Microsoft.Extensions.Logging.Console -->
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<MicrosoftExtensionsLoggingConsolePackageVersion>3.1.0</MicrosoftExtensionsLoggingConsolePackageVersion>
|
||||
<!-- Microsoft.Extensions.Logging.Debug -->
|
||||
<MicrosoftExtensionsLoggingDebugPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsLoggingDebugPackageVersion>
|
||||
<MicrosoftExtensionsLoggingDebugPackageVersion>3.1.0</MicrosoftExtensionsLoggingDebugPackageVersion>
|
||||
<!-- Microsoft.Extensions.Logging -->
|
||||
<MicrosoftExtensionsLoggingPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<MicrosoftExtensionsLoggingPackageVersion>3.1.0</MicrosoftExtensionsLoggingPackageVersion>
|
||||
<!-- Microsoft.Extensions.Options.ConfigurationExtensions -->
|
||||
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.1.0-preview3.19553.2</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
|
||||
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>3.1.0</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
|
||||
<!-- Microsoft.NET.Sdk.Razor -->
|
||||
<MicrosoftNETSdkRazorPackageVersion>3.1.0-preview3.19553.1</MicrosoftNETSdkRazorPackageVersion>
|
||||
<MicrosoftNETSdkRazorPackageVersion>3.1.0</MicrosoftNETSdkRazorPackageVersion>
|
||||
<!-- Microsoft.NET.Test.Sdk-->
|
||||
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
|
||||
<MoqPackageVersion>4.9.0</MoqPackageVersion>
|
||||
|
|
|
|||
|
|
@ -112,7 +112,6 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$")
|
|||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netstandard2.0</TargetFramework>
|
||||
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Contracts</AssemblyName>
|
||||
|
|
|
|||
|
|
@ -4,22 +4,21 @@
|
|||
Edit the Shared.proj file to add additional package/ project references.
|
||||
-->
|
||||
|
||||
<Import Project="$(RepositoryEngineeringDir)\Package.props" />
|
||||
<Import Project="Shared.props" />
|
||||
<PropertyGroup>
|
||||
<TargetFrameworks>net461;netcoreapp3.0</TargetFrameworks>
|
||||
<TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
|
||||
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
|
||||
<PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Design</PackageId>
|
||||
<RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp3.0' ">win7-x64</RuntimeIdentifier>
|
||||
<X86BinDirectory>..\..\artifacts\bin\VS.Web.CG.Design-x86\</X86BinDirectory>
|
||||
<ARMBinDirectory>..\..\artifacts\bin\VS.Web.CG.Design-arm\</ARMBinDirectory>
|
||||
<ARM64BinDirectory>..\..\artifacts\bin\VS.Web.CG.Design-arm64\</ARM64BinDirectory>
|
||||
<AnyCpuBinDirectory>..\..\artifacts\bin\VS.Web.CG.Design-anycpu\</AnyCpuBinDirectory>
|
||||
<RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp3.1' ">win7-x64</RuntimeIdentifier>
|
||||
<X86BinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-x86\</X86BinDirectory>
|
||||
<ARMBinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-arm\</ARMBinDirectory>
|
||||
<ARM64BinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-arm64\</ARM64BinDirectory>
|
||||
<AnyCpuBinDirectory>$(ArtifactsBinDir)VS.Web.CG.Design-anycpu\</AnyCpuBinDirectory>
|
||||
|
||||
<X86ProjectDirectory>..\..\tools\VS.Web.CG.Design-x86\</X86ProjectDirectory>
|
||||
<ARMProjectDirectory>..\..\tools\VS.Web.CG.Design-arm\</ARMProjectDirectory>
|
||||
<ARM64ProjectDirectory>..\..\tools\VS.Web.CG.Design-arm64\</ARM64ProjectDirectory>
|
||||
<AnyCpuProjectDirectory>..\..\tools\VS.Web.CG.Design-anycpu\</AnyCpuProjectDirectory>
|
||||
<X86ProjectDirectory>$(RepoRoot)tools\VS.Web.CG.Design-x86\</X86ProjectDirectory>
|
||||
<ARMProjectDirectory>$(RepoRoot)tools\VS.Web.CG.Design-arm\</ARMProjectDirectory>
|
||||
<ARM64ProjectDirectory>$(RepoRoot)tools\VS.Web.CG.Design-arm64\</ARM64ProjectDirectory>
|
||||
<AnyCpuProjectDirectory>$(RepoRoot)tools\VS.Web.CG.Design-anycpu\</AnyCpuProjectDirectory>
|
||||
<IncludeBuildOutput>false</IncludeBuildOutput>
|
||||
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
|
||||
<IncludeSymbols>true</IncludeSymbols>
|
||||
|
|
@ -32,11 +31,6 @@
|
|||
<ProjectReference Include="$(AnyCpuProjectDirectory)\VS.Web.CG.Design-anycpu.csproj" PrivateAssets="true" ReferenceOutputAssembly="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<!-- Set to PrivateAssets=All so the package does not appear in the generated nuspec. This prevents issues such as https://github.com/aspnet/Scaffolding/issues/645. -->
|
||||
<PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
|
||||
</ItemGroup>
|
||||
|
||||
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
@ -55,9 +49,9 @@
|
|||
copyright=$(Copyright);
|
||||
AssemblyName=$(AssemblyName);
|
||||
|
||||
OutputBinary=$(OutputPath)netcoreapp3.0\$(AssemblyName).dll;
|
||||
OutputDocumentation=$(OutputPath)netcoreapp3.0\$(AssemblyName).xml;
|
||||
OutputSymbol=$(OutputPath)netcoreapp3.0\$(AssemblyName).pdb;
|
||||
OutputBinary=$(OutputPath)netcoreapp3.1\$(AssemblyName).dll;
|
||||
OutputDocumentation=$(OutputPath)netcoreapp3.1\$(AssemblyName).xml;
|
||||
OutputSymbol=$(OutputPath)netcoreapp3.1\$(AssemblyName).pdb;
|
||||
|
||||
OutputAnyExe=$(AnyCpuBinDirectory)$(Configuration)\net461\$(AssemblyName).exe;
|
||||
OutputAnyDocumentation=$(AnyCpuBinDirectory)$(Configuration)\net461\$(AssemblyName).xml;
|
||||
|
|
|
|||
|
|
@ -15,16 +15,16 @@
|
|||
<group targetFramework=".NETFramework4.6.1">
|
||||
<dependency id="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" version="$version$" exclude="Build,Analyzers" />
|
||||
</group>
|
||||
<group targetFramework=".netcoreapp3.0">
|
||||
<group targetFramework=".NETCoreApp3.1">
|
||||
<dependency id="Microsoft.VisualStudio.Web.CodeGenerators.Mvc" version="$version$" exclude="Build,Analyzers" />
|
||||
</group>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
|
||||
<files>
|
||||
<file src="$OutputBinary$" target="lib\netcoreapp3.0\$AssemblyName$.dll" />
|
||||
<file src="$OutputDocumentation$" target="lib\netcoreapp3.0\$AssemblyName$.xml" />
|
||||
<file src="$OutputSymbol$" target="lib\netcoreapp3.0\$AssemblyName$.pdb" />
|
||||
<file src="$OutputBinary$" target="lib\netcoreapp3.1\$AssemblyName$.dll" />
|
||||
<file src="$OutputDocumentation$" target="lib\netcoreapp3.1\$AssemblyName$.xml" />
|
||||
<file src="$OutputSymbol$" target="lib\netcoreapp3.1\$AssemblyName$.pdb" />
|
||||
|
||||
<file src="$OutputAnyExe$" target="lib\net461\$AssemblyName$.exe" />
|
||||
<file src="$OutputAnyDocumentation$" target="lib\net461\$AssemblyName$.xml" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="$(RepositoryEngineeringDir)\Package.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<Description>Contains Entity Framework Core Services used by ASP.NET Core Code Generators.</Description>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="$(RepositoryEngineeringDir)\Package.props" />
|
||||
<PropertyGroup>
|
||||
<Description>Code Generation tool for ASP.NET Core. Contains the dotnet-aspnet-codegenerator command used for generating controllers and views. </Description>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Tools</RootNamespace>
|
||||
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||
<OutputType>exe</OutputType>
|
||||
|
|
@ -41,7 +40,7 @@
|
|||
<ItemGroup>
|
||||
<None Include="..\VS.Web.CG.Msbuild\Target\build\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" CopyToPublishDirectory="Always" Link="build\microsoft.visualstudio.web.codegeneration.tools.targets" />
|
||||
<None Include="..\VS.Web.CG.Msbuild\Target\buildMultiTargeting\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" CopyToPublishDirectory="Always" Link="buildMultiTargeting\microsoft.visualstudio.web.codegeneration.tools.targets" />
|
||||
<None Include="$(ArtifactsBinDir)\VS.Web.CG.Msbuild\$(Configuration)\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" CopyToPublishDirectory="Always" Link="toolassets\netcoreapp3.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />
|
||||
<None Include="$(ArtifactsBinDir)\VS.Web.CG.Msbuild\$(Configuration)\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" CopyToPublishDirectory="Always" Link="toolassets\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />
|
||||
<None Include="$(ArtifactsBinDir)\VS.Web.CG.Msbuild\$(Configuration)\net461\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" CopyToPublishDirectory="Always" Link="toolassets\net461\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<Import Project="$(RepoRoot)test\TestPackage.props" />
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||
</PropertyGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -656,7 +656,7 @@ Outputs the Project Information needed for CodeGeneration to a file.
|
|||
<!-- For Portable Msbuild, MSBuildRuntimeType = 'Core'. For Desktop MsBuild, MSBuildRuntimeType = 'Full'-->
|
||||
<When Condition=""'$(MSBuildRuntimeType)' == 'Core'"">
|
||||
<PropertyGroup>
|
||||
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolAssets\netcoreapp3.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
|
||||
<EvaluateProjectInfoForCodeGenerationAssemblyPath>$(MSBuildThisFileDirectory)..\toolAssets\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll</EvaluateProjectInfoForCodeGenerationAssemblyPath>
|
||||
</PropertyGroup>
|
||||
</When>
|
||||
<Otherwise>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
{
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Root"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Library1"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netcoreapp3.0"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netstandard2.0"));
|
||||
fileProvider.Add("global.json", GlobalJsonText);
|
||||
|
||||
var rootProjectTxt = fullFramework ? MsBuildProjectStrings.RootNet45ProjectTxt : MsBuildProjectStrings.RootProjectTxt;
|
||||
|
|
@ -67,7 +67,7 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
|
||||
// Copy Msbuild task dlls.
|
||||
var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netcoreapp3.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Add($"Root/Startup.cs", MsBuildProjectStrings.StartupTxt);
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.ProgramFileName}", MsBuildProjectStrings.ProgramFileText);
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
{
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Root"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Library1"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netcoreapp3.0"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netstandard2.0"));
|
||||
|
||||
fileProvider.Add("global.json", GlobalJsonText);
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.RootProjectName}", MsBuildProjectStrings.RootProjectTxt);
|
||||
|
|
@ -90,7 +90,7 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
|
||||
// Copy Msbuild task dlls.
|
||||
var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netcoreapp3.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Add($"Root/Startup.cs", MsBuildProjectStrings.StartupForIdentityTxt);
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.ProgramFileName}", MsBuildProjectStrings.ProgramFileText);
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.IdentityContextName}", MsBuildProjectStrings.IdentityContextText);
|
||||
|
|
@ -131,14 +131,14 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
{
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Root"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Library1"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netcoreapp3.0"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netstandard2.0"));
|
||||
|
||||
fileProvider.Add("global.json", GlobalJsonText);
|
||||
fileProvider.Add($"Root/TestCodeGeneration.targets", MsBuildProjectStrings.TestCodeGenerationTargetFileText);
|
||||
|
||||
// Copy Msbuild task dlls.
|
||||
var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netcoreapp3.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
var rootProjectTxt = MsBuildProjectStrings.RootProjectTxtWithoutEF;
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.RootProjectName}", rootProjectTxt);
|
||||
fileProvider.Add($"Root/Startup.cs", MsBuildProjectStrings.StartupTxtWithoutEf);
|
||||
|
|
@ -158,13 +158,13 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration
|
|||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Root"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "DAL"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "Library1"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netcoreapp3.0"));
|
||||
Directory.CreateDirectory(Path.Combine(fileProvider.Root, "toolAssets", "netstandard2.0"));
|
||||
|
||||
fileProvider.Add($"Root/TestCodeGeneration.targets", MsBuildProjectStrings.TestCodeGenerationTargetFileText);
|
||||
|
||||
// Copy Msbuild task dlls.
|
||||
var msbuildTaskDllPath = Path.Combine(Path.GetDirectoryName(typeof(MsBuildProjectSetupHelper).Assembly.Location), "Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netcoreapp3.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
fileProvider.Copy(msbuildTaskDllPath, "toolAssets/netstandard2.0/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll");
|
||||
|
||||
var rootProjectTxt = MsBuildProjectStrings.WebProjectTxt;
|
||||
fileProvider.Add($"Root/{MsBuildProjectStrings.RootProjectName}", rootProjectTxt);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<Import Project="$(RepoRoot)test\TestPackage.props" />
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.0</TargetFramework>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Tools.Test</AssemblyName>
|
||||
<RootNamespace>Microsoft.VisualStudio.Web.CodeGeneration.Tools</RootNamespace>
|
||||
<NoWarn>$(NoWarn);CS1591</NoWarn>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче