Add .net8.dll and and check for it. Remove .net5 since it is EOL (#3841)

This commit is contained in:
Nathan 2023-09-12 15:57:32 -07:00 коммит произвёл GitHub
Родитель 53db433877
Коммит 89035619e6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
20 изменённых файлов: 1745 добавлений и 1713 удалений

Двоичный файл не отображается.

Двоичный файл не отображается.

Двоичный файл не отображается.

Двоичный файл не отображается.

Просмотреть файл

@ -1,12 +1,13 @@
{ {
"runtimeOptions": { "runtimeOptions": {
"tfm": "net5.0", "tfm": "net8.0",
"framework": { "framework": {
"name": "Microsoft.NETCore.App", "name": "Microsoft.NETCore.App",
"version": "5.0.0" "version": "8.0.0-preview.7.23375.6"
}, },
"configProperties": { "configProperties": {
"System.Reflection.Metadata.MetadataUpdater.IsSupported": false "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
} "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
} }
}
} }

Просмотреть файл

@ -61,7 +61,7 @@ async function getFramework(context: IActionContext, workingDirectory: string |
} }
// Prioritize "LTS", then "Current", then "Preview" // Prioritize "LTS", then "Current", then "Preview"
const netVersions: string[] = ['6.0', '7.0', '5.0']; const netVersions: string[] = ['6.0', '7.0', '8.0'];
const semVersions: SemVer[] = netVersions.map(v => semVerCoerce(v) as SemVer); const semVersions: SemVer[] = netVersions.map(v => semVerCoerce(v) as SemVer);
let pickedVersion: SemVer | undefined; let pickedVersion: SemVer | undefined;

32
tools/JsonCli/.vscode/tasks.json поставляемый
Просмотреть файл

@ -11,22 +11,6 @@
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
}, },
{
"label": "publish (5.0)",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"--configuration",
"Release",
"--framework",
"net5.0",
"--output",
"${workspaceFolder}/../../resources/dotnetJsonCli/net5.0/",
"${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj"
],
"problemMatcher": "$msCompile"
},
{ {
"label": "publish (6.0)", "label": "publish (6.0)",
"command": "dotnet", "command": "dotnet",
@ -58,6 +42,22 @@
"${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj" "${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj"
], ],
"problemMatcher": "$msCompile" "problemMatcher": "$msCompile"
},
{
"label": "publish (8.0)",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"--configuration",
"Release",
"--framework",
"net8.0",
"--output",
"${workspaceFolder}/../../resources/dotnetJsonCli/net8.0/",
"${workspaceFolder}/src/Microsoft.TemplateEngine.JsonCli.csproj"
],
"problemMatcher": "$msCompile"
} }
] ]
} }

Просмотреть файл

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks> <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\resources\FinalPublicKey.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>..\resources\FinalPublicKey.snk</AssemblyOriginatorKeyFile>
<DelaySign>true</DelaySign> <DelaySign>true</DelaySign>

31
tools/JsonCli/src/src.sln Normal file
Просмотреть файл

@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TemplateEngine.JsonCli", "Microsoft.TemplateEngine.JsonCli.csproj", "{5BA9AEF9-30E9-404D-A10E-323AFABE6E9C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Signing", "Signing.csproj", "{E43DBE76-FC2D-4ACB-A657-7E42C074F233}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5BA9AEF9-30E9-404D-A10E-323AFABE6E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5BA9AEF9-30E9-404D-A10E-323AFABE6E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5BA9AEF9-30E9-404D-A10E-323AFABE6E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5BA9AEF9-30E9-404D-A10E-323AFABE6E9C}.Release|Any CPU.Build.0 = Release|Any CPU
{E43DBE76-FC2D-4ACB-A657-7E42C074F233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E43DBE76-FC2D-4ACB-A657-7E42C074F233}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E43DBE76-FC2D-4ACB-A657-7E42C074F233}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E43DBE76-FC2D-4ACB-A657-7E42C074F233}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D82CD8F7-6A0F-4D71-834B-E173DB4632D1}
EndGlobalSection
EndGlobal