Browse Source
Merge branch 'master' into refactor/obsolete-istyleable
pull/11380/head
Steven Kirk
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
3 additions and
3 deletions
-
nukebuild/_build.csproj
-
src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
-
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
|
|
|
@ -15,7 +15,7 @@ |
|
|
|
<PackageReference Include="vswhere" Version="2.6.7" Condition=" '$(OS)' == 'Windows_NT' " /> |
|
|
|
<PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" /> |
|
|
|
<!-- Keep in sync with Avalonia.Build.Tasks --> |
|
|
|
<PackageReference Include="Mono.Cecil" Version="0.11.4" /> |
|
|
|
<PackageReference Include="Mono.Cecil" Version="0.11.5" /> |
|
|
|
<PackageReference Include="SourceLink" Version="1.1.0" GeneratePathProperty="true" /> |
|
|
|
<PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" PrivateAssets="All" /> |
|
|
|
<PackageReference Include="xunit.runner.console" Version="2.4.2"> |
|
|
|
|
|
|
|
@ -118,7 +118,7 @@ |
|
|
|
<Compile Include="..\Avalonia.Base\Utilities\SpanHelpers.cs" Link="Utilities\SpanHelpers.cs" /> |
|
|
|
<Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" /> |
|
|
|
<Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" /> |
|
|
|
<PackageReference Include="Mono.Cecil" Version="0.11.4" /> |
|
|
|
<PackageReference Include="Mono.Cecil" Version="0.11.5" /> |
|
|
|
<PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" /> |
|
|
|
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit e5254eb1b2017f78a92acd466c8fa1e47401056b |
|
|
|
Subproject commit c5d5d8b78dce42dfb7b7f320a5c345da36a58579 |
