General update on build and dependencies (#7)
This commit is contained in:
Родитель
6ef58c742e
Коммит
545d581b27
|
@ -23,7 +23,7 @@ jobs:
|
|||
- job: Build_tools
|
||||
|
||||
pool:
|
||||
vmImage: 'windows-2019'
|
||||
vmImage: 'windows-latest'
|
||||
|
||||
variables:
|
||||
DOTNET_NOLOGO: true
|
||||
|
@ -54,7 +54,7 @@ jobs:
|
|||
displayName: 'Use .NET Core sdk'
|
||||
inputs:
|
||||
packageType: sdk
|
||||
version: 5.x
|
||||
version: 6.x
|
||||
|
||||
- task: DotNetCoreCLI@2
|
||||
condition: ne(variables['system.pullrequest.isfork'], true)
|
||||
|
@ -160,13 +160,13 @@ jobs:
|
|||
##################################
|
||||
# report build failure to Discord
|
||||
- job: Report_Build_Failure
|
||||
condition: failed('Build_tools')
|
||||
|
||||
dependsOn:
|
||||
- Build_tools
|
||||
condition: failed('Build_tools')
|
||||
|
||||
pool:
|
||||
vmImage: 'VS2017-Win2016'
|
||||
vmImage: 'windows-latest'
|
||||
|
||||
steps:
|
||||
|
||||
|
@ -174,6 +174,7 @@ jobs:
|
|||
fetchDepth: 1
|
||||
|
||||
# step from template @ nf-tools repo
|
||||
# report error
|
||||
- template: azure-pipelines-templates/discord-webhook.yml@templates
|
||||
parameters:
|
||||
status: 'failure'
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.30907.101
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.4.33213.308
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "hex2dfu", "source\hex2dfu.csproj", "{85CA39C2-5404-4E03-8CB5-2E098ABBC02C}"
|
||||
EndProject
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
|
||||
<IsPackable>false</IsPackable>
|
||||
|
||||
|
@ -9,13 +9,13 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
|
||||
<PackageReference Include="xunit" Version="2.4.1" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
|
||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
|
||||
<PackageReference Include="xunit" Version="2.4.2" />
|
||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="coverlet.collector" Version="3.0.2">
|
||||
<PackageReference Include="coverlet.collector" Version="3.2.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@ -25,4 +25,8 @@
|
|||
<ProjectReference Include="..\hex2dfu.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.119" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -66,8 +66,8 @@ namespace nanoFramework.Tools
|
|||
{
|
||||
byte[] ser = new byte[274];
|
||||
Encoding.ASCII.GetBytes(Signature).CopyTo(ser, 0);
|
||||
ser[6] = AlternateSetting ? 1 : 0;
|
||||
ser[7] = IsTargetName ? 1 : 0;
|
||||
ser[6] = AlternateSetting ? (byte)1 : (byte)0;
|
||||
ser[7] = IsTargetName ? (byte)1 : (byte)0;
|
||||
if (IsTargetName)
|
||||
{
|
||||
Encoding.ASCII.GetBytes(TargetName).CopyTo(ser, 11);
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
<LangVersion>9.0</LangVersion>
|
||||
<EnableDefaultItems>false</EnableDefaultItems>
|
||||
<Platforms>AnyCPU;x64</Platforms>
|
||||
|
@ -12,11 +12,15 @@
|
|||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="*.cs" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.119" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
|
||||
"version": "2.0",
|
||||
"version": "3.0",
|
||||
"release": {
|
||||
"branchName" : "release-v{version}",
|
||||
"versionIncrement" : "build",
|
||||
|
|
Загрузка…
Ссылка в новой задаче