merge conflicts
This commit is contained in:
commit
2bf20edad6
234 changed files with 2238 additions and 2897 deletions
|
@ -1,6 +1,6 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp6.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@ -14,4 +14,4 @@
|
|||
<ItemGroup>
|
||||
<ProjectReference Include="..\TableGenerator\TableGenerator.fsproj" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
@ -11,10 +11,7 @@ let inputBranches =
|
|||
AkaMsChannel = Some("8.0.1xx/daily") }
|
||||
{ GitBranchName = "release/7.0.2xx"
|
||||
DisplayName = "Release/7.0.2xx<br>(7.0.x Runtime)"
|
||||
AkaMsChannel = Some("7.0.2xx/daily") }
|
||||
{ GitBranchName = "release/7.0.1xx"
|
||||
DisplayName = "Release/7.0.1xx<br>(7.0.x Runtime)"
|
||||
AkaMsChannel = Some("7.0.1xx/daily") }]
|
||||
AkaMsChannel = Some("7.0.2xx/daily") }]
|
||||
|
||||
|
||||
let referentNotes = """Reference notes:
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>netcoreapp6.0</TargetFramework>
|
||||
<TargetFramework>net6.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue