Skip to content

Start of 10.0 release #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 14, 2020
Merged

Start of 10.0 release #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5faff4f
Initial support for C#8 nullable types
smaillet Feb 29, 2020
e630c4e
* Added more doc comment details of the bindingsConfig.yml file
smaillet Mar 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,427 changes: 1,427 additions & 0 deletions .editorconfig
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Build-All.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Param(
[string]$Configuration="Release",
[switch]$AllowVsPreReleases,
[switch]$NoClean,
[switch]$ForceClean,
[ValidateSet('All','Source','Docs')]
[System.String]$BuildMode = 'All'
)
Expand All @@ -25,13 +25,13 @@ switch($BuildMode)

try
{
if( (Test-Path -PathType Container $BuildPaths.BuildOutputPath) -and !$NoClean )
if( (Test-Path -PathType Container $BuildPaths.BuildOutputPath) -and $ForceClean )
{
Write-Information "Cleaning output folder from previous builds"
rd -Recurse -Force -Path $BuildPaths.BuildOutputPath
}

md $BuildPaths.NuGetOutputPath -ErrorAction SilentlyContinue| Out-Null
md $BuildPaths.NuGetOutputPath -ErrorAction SilentlyContinue | Out-Null

if($BuildSource)
{
Expand Down
8 changes: 4 additions & 4 deletions Build-Docs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ try
}
}

$docfxRestoreBinLogPath = Join-Path $BuildPaths.BinLogsPath Llvm.NET-docfx-Build.restore.binlog
$docfxBinLogPath = Join-Path $BuildPaths.BinLogsPath Llvm.NET-docfx-Build.binlog
$docfxRestoreBinLogPath = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm-docfx-Build.restore.binlog
$docfxBinLogPath = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm-docfx-Build.binlog

# DocFX.console build support is peculiar and a bit fragile, It requires a separate restore path or it won't do anything for the build target.
Write-Information "Restoring Docs Project"
Invoke-MSBuild -Targets 'Restore' -Project docfx\Llvm.NET.DocFX.csproj -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$docfxRestoreBinLogPath") )
Invoke-MSBuild -Targets 'Restore' -Project docfx\Ubiquity.NET.Llvm.DocFX.csproj -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$docfxRestoreBinLogPath") )

Write-Information "Building Docs Project"
Invoke-MSBuild -Targets 'Build' -Project docfx\Llvm.NET.DocFX.csproj -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$docfxBinLogPath") )
Invoke-MSBuild -Targets 'Build' -Project docfx\Ubiquity.NET.Llvm.DocFX.csproj -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$docfxBinLogPath") )
}
finally
{
Expand Down
17 changes: 10 additions & 7 deletions Build-Interop.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,11 @@ try
# is basically hostile to the newer SDK project format.
Invoke-MSBuild -Targets 'Restore;Build' -Project 'src\Interop\LlvmBindingsGenerator\LlvmBindingsGenerator.csproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$generatorBuildLogPath"))

# At present CppSharp only supports the "desktop" framework, so limiting this to net47 for now
# Hopefully they will support .NET Core soon, if not the generation stage may need to move out
# to a manual step with the results checked in.
Write-Information "Generating P/Invoke Bindings"
& "$($BuildPaths.BuildOutputPath)\bin\LlvmBindingsGenerator\Release\net47\LlvmBindingsGenerator.exe" $BuildPaths.LlvmLibsRoot (Join-Path $BuildPaths.SrcRoot 'Interop\LibLLVM') (Join-Path $BuildPaths.SrcRoot 'Interop\Llvm.NET.Interop')
& "$($BuildPaths.BuildOutputPath)\bin\LlvmBindingsGenerator\Release\net47\LlvmBindingsGenerator.exe" $BuildPaths.LlvmLibsRoot (Join-Path $BuildPaths.SrcRoot 'Interop\LibLLVM') (Join-Path $BuildPaths.SrcRoot 'Interop\Ubiquity.NET.Llvm.Interop')
if($LASTEXITCODE -eq 0)
{
# now build the projects that consume generated output for the bindings
Expand All @@ -66,14 +69,14 @@ try
Invoke-NuGet restore 'src\Interop\LibLLVM\LibLLVM.vcxproj'

Write-Information "Building LibLLVM"
$libLLVMBinLogPath = Join-Path $BuildPaths.BinLogsPath Llvm.NET.Interop-restore.binlog
$libLLVMBinLogPath = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm.Interop-restore.binlog
Invoke-MSBuild -Targets 'Build' -Project 'src\Interop\LibLLVM\LibLLVM.vcxproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$libLLVMBinLogPath") )

Write-Information "Building Lllvm.NET.Interop"
$interopRestoreBinLogPath = Join-Path $BuildPaths.BinLogsPath Llvm.NET.Interop-restore.binlog
$interopBinLog = Join-Path $BuildPaths.BinLogsPath Llvm.NET.Interop.binlog
Invoke-MSBuild -Targets 'Restore' -Project 'src\Interop\Llvm.NET.Interop\Llvm.NET.Interop.csproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$InteropRestoreBinLogPath") )
Invoke-MSBuild -Targets 'Build' -Project 'src\Interop\Llvm.NET.Interop\Llvm.NET.Interop.csproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$interopBinLog") )
Write-Information "Building Ubiquity.NET.Llvm.Interop"
$interopRestoreBinLogPath = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm.Interop-restore.binlog
$interopBinLog = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm.Interop.binlog
Invoke-MSBuild -Targets 'Restore' -Project 'src\Interop\Ubiquity.NET.Llvm.Interop\Ubiquity.NET.Llvm.Interop.csproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$InteropRestoreBinLogPath") )
Invoke-MSBuild -Targets 'Build' -Project 'src\Interop\Ubiquity.NET.Llvm.Interop\Ubiquity.NET.Llvm.Interop.csproj' -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$interopBinLog") )
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions Build-Source.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ try

.\Build-Interop.ps1 -BuildInfo $BuildInfo

$buildLogPath = Join-Path $BuildPaths.BinLogsPath Llvm.NET.binlog
Write-Information "Building Llvm.NET"
Invoke-MSBuild -Targets 'Restore;Build' -Project src\Llvm.NET.sln -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$buildLogPath") )
$buildLogPath = Join-Path $BuildPaths.BinLogsPath Ubiquity.NET.Llvm.binlog
Write-Information "Building Ubiquity.NET.Llvm"
Invoke-MSBuild -Targets 'Restore;Build' -Project src\Ubiquity.NET.Llvm.sln -Properties $msBuildProperties -LoggerArgs ($BuildInfo.MsBuildLoggerArgs + @("/bl:$buildLogPath") )

pushd $BuildPaths.NuGetOutputPath
Compress-Archive -Force -Path *.* -DestinationPath (join-path $BuildPaths.BuildOutputPath Nuget.Packages.zip)
Expand Down
5 changes: 3 additions & 2 deletions BuildVersion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<BuildVersionData
BuildMajor = "8"
BuildMajor = "10"
BuildMinor = "0"
BuildPatch = "1"
BuildPatch = "0"
PreReleaseName = "alpha"
/>
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
<CodeAnalysisIgnoreGeneratedCode>true</CodeAnalysisIgnoreGeneratedCode>
<Determenistic>true</Determenistic>
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup Condition="'$(NoCommonAnalyzers)'!='true'">
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />
Expand Down
2 changes: 1 addition & 1 deletion Invoke-UnitTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Initialize-BuildEnvironment
$testsFailed = $false

Write-Information 'Running tests as x64'
$testProj = Join-Path $BuildPaths.SrcRoot 'Llvm.NETTests\Llvm.NET.Tests.csproj'
$testProj = Join-Path $BuildPaths.SrcRoot 'Ubiquity.NET.LlvmTests\Ubiquity.NET.Llvm.Tests.csproj'
$runSettings = Join-Path $BuildPaths.SrcRoot 'x64.runsettings'
dotnet test $testProj -s $runSettings --no-build --no-restore --logger "trx" -r $BuildPaths.TestResultsPath
$testsFailed = $testsFailed -or ($LASTEXITCODE -ne 0)
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ is furnished to do so, subject to the following conditions:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimers
in the documentation and/or other materials provided with the distribution.
* Neither the names of llvm.org, Llvm.NET, nor the names of its contributors may be used to endorse or promote products derived
* Neither the names of llvm.org, Ubiquity.NET, nor the names of its contributors may be used to endorse or promote products derived
from this Software without specific prior written permission.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
Expand Down
10 changes: 5 additions & 5 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Update="Ubiquity.ArgValidators" Version="6.0.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Update="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Update="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Update="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Update="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Update="System.Memory" Version="4.5.3" />
<PackageReference Update="CppSharp" Version="0.10.1" />
<PackageReference Update="Antlr4" Version="4.6.6"/>
<PackageReference Update="OpenSoftware.DgmlBuilder" Version="1.13.0" Condition="'$(TargetFramework)'=='net47'" />
<PackageReference Update="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Update="System.Reactive" Version="4.1.5" />
<PackageReference Update="System.Collections.Immutable" Version="1.7.0" />
<PackageReference Update="System.Reactive" Version="4.3.2" />
<!-- See: https://github.com/dotnet/docfx/issues/5536 before updating...-->
<PackageReference Update="docfx.console" Version="2.48.1" />
<PackageReference Update="memberpage" Version="2.49.0" />
Expand Down
Loading