mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

merge conflicts

Browse source
This commit is contained in:
Mike Mulchrone 2023-01-04 04:08:49 -05:00
commit 2bf20edad6
234 changed files with 2238 additions and 2897 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tools/sdk-readme-table-generator/TableGenerator.Tests/TableGenerator.Tests.fsproj
View file

@ -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>

5
tools/sdk-readme-table-generator/TableGenerator/Program.fs
View file

@ -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&nbsp;Runtime)"
AkaMsChannel = Some("7.0.2xx/daily") }
{ GitBranchName = "release/7.0.1xx"
DisplayName = "Release/7.0.1xx<br>(7.0.x&nbsp;Runtime)"
AkaMsChannel = Some("7.0.1xx/daily") }]
AkaMsChannel = Some("7.0.2xx/daily") }]
let referentNotes = """Reference notes:

2
tools/sdk-readme-table-generator/TableGenerator/TableGenerator.fsproj
View file

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp6.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>