Browse Source

Merge pull request #983 from wieslawsoltes/RemoveNugetWorkaround

Remove NuGet workaround
pull/916/merge
Nikita Tsukanov 9 years ago
committed by GitHub
parent
commit
ced4c9bdf0
  1. 1
      appveyor.yml
  2. 1
      build.cake
  3. 1
      build/UnitTests.NetCore.targets
  4. 1
      samples/BindingTest/BindingTest.csproj
  5. 1
      samples/ControlCatalog.Android/ControlCatalog.Android.csproj
  6. 1
      samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj
  7. 1
      samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
  8. 1
      samples/RenderTest/RenderTest.csproj
  9. 1
      samples/VirtualizationTest/VirtualizationTest.csproj
  10. 1
      samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj
  11. 1
      samples/interop/GtkInteropDemo/GtkInteropDemo.csproj
  12. 1
      samples/interop/WindowsInteropTest/WindowsInteropTest.csproj
  13. 4
      src/Android/Avalonia.Android/Avalonia.Android.csproj
  14. 1
      src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
  15. 1
      src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj
  16. 1
      src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj
  17. 1
      src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj
  18. BIN
      src/Shared/Microsoft.NuGet.Build.Tasks.Patched.dll
  19. 67
      src/Shared/nuget.workaround.targets
  20. 1
      src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
  21. 1
      src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj
  22. 4
      src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
  23. 1
      src/Windows/Avalonia.Designer/Avalonia.Designer.csproj
  24. 1
      src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj
  25. 1
      src/Windows/Avalonia.Win32/Avalonia.Win32.csproj
  26. 4
      src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
  27. 1
      src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj
  28. 1
      tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj
  29. 1
      tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj
  30. 1
      tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj
  31. 1
      tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj
  32. 1
      tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj
  33. 1
      tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj
  34. 1
      tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
  35. 1
      tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj
  36. 4
      tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj

1
appveyor.yml

@ -14,7 +14,6 @@ environment:
secure: OtVfyN3ErqQrDTnWH2HDfJDlCiu/i4/X4wFmK3ZXXP7HmCiXYPSbTjMPwwdOxRaK
MYGET_API_URL: https://www.myget.org/F/avalonia-ci/api/v2/package
init:
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/appveyor/ci/master/scripts/xamarin-vs2017-151-fixed.targets', "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Microsoft.Common.Targets\ImportAfter\Xamarin.Common.targets")
- ps: if (Test-Path env:nuget_address) {[System.IO.File]::AppendAllText("C:\Windows\System32\drivers\etc\hosts", "`n$($env:nuget_address)`tapi.nuget.org")}
install:
- if not exist gtk-sharp-2.12.26.msi appveyor DownloadFile http://download.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.26.msi

1
build.cake

@ -119,7 +119,6 @@ Task("Restore-NuGet-Packages")
}})
.Execute(()=> {
NuGetRestore(parameters.MSBuildSolution, new NuGetRestoreSettings {
ToolPath = "./tools/NuGet.CommandLine/tools/NuGet.exe",
ToolTimeout = TimeSpan.FromMinutes(toolTimeout)
});
});

1
build/UnitTests.NetCore.targets

@ -25,5 +25,4 @@
<ItemGroup>
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
</ItemGroup>
<Import Condition="'$(TargetFramework)' == 'net461'" Project="$(MSBuildThisFileDirectory)..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/BindingTest/BindingTest.csproj

@ -162,5 +162,4 @@
<Import Project="..\..\build\Serilog.Sinks.Trace.props" />
<Import Project="..\..\build\Splat.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/ControlCatalog.Android/ControlCatalog.Android.csproj

@ -158,5 +158,4 @@
</ItemGroup>
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/ControlCatalog.Desktop/ControlCatalog.Desktop.csproj

@ -144,5 +144,4 @@
<Import Project="..\..\build\Serilog.props" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\Serilog.Sinks.Trace.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj

@ -181,5 +181,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/RenderTest/RenderTest.csproj

@ -183,5 +183,4 @@
<Import Project="..\..\build\Serilog.Sinks.Trace.props" />
<Import Project="..\..\build\Splat.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/VirtualizationTest/VirtualizationTest.csproj

@ -158,5 +158,4 @@
<Import Project="..\..\build\Serilog.Sinks.Trace.props" />
<Import Project="..\..\build\Splat.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/interop/Direct3DInteropSample/Direct3DInteropSample.csproj

@ -31,5 +31,4 @@
<Import Project="..\..\..\build\Serilog.Sinks.Trace.props" />
<Import Project="..\..\..\build\Splat.props" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/interop/GtkInteropDemo/GtkInteropDemo.csproj

@ -151,5 +151,4 @@
</ItemGroup>
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
samples/interop/WindowsInteropTest/WindowsInteropTest.csproj

@ -186,5 +186,4 @@
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\SkiaSharp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\..\src\Shared\nuget.workaround.targets" />
</Project>

4
src/Android/Avalonia.Android/Avalonia.Android.csproj

@ -133,8 +133,4 @@
<Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
<PropertyGroup Condition="'$(UseRoslynPathHack)' == ''">
<CscToolPath>$(MSBuildToolsPath)\Roslyn</CscToolPath>
</PropertyGroup>
</Project>

1
src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj

@ -157,5 +157,4 @@
<Import Project="..\..\..\build\Splat.props" />
<Import Project="..\..\..\build\Sprache.props" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
src/Avalonia.DotNetFrameworkRuntime/Avalonia.DotNetFrameworkRuntime.csproj

@ -69,5 +69,4 @@
<Import Project="..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\Shared\nuget.workaround.targets" />
</Project>

1
src/Gtk/Avalonia.Cairo/Avalonia.Cairo.csproj

@ -103,5 +103,4 @@
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
src/Gtk/Avalonia.Gtk/Avalonia.Gtk.csproj

@ -98,5 +98,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

BIN
src/Shared/Microsoft.NuGet.Build.Tasks.Patched.dll

Binary file not shown.

67
src/Shared/nuget.workaround.targets

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is for a workaround for this NuGet issue https://github.com/NuGet/Home/issues/4532
It is built from the master branch of NuGet.BuildTasks with a different class name as not to conflict with the original.
It can most likely be removed when the next version of NuGet.BuildTasks is released: https://github.com/NuGet/NuGet.BuildTasks/pull/29
-->
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="Microsoft.NuGet.Build.Tasks.ResolveNuGetPackageAssetsPatched" AssemblyFile="Microsoft.NuGet.Build.Tasks.Patched.dll" />
<Target Name="ResolveNuGetPackageAssets"
DependsOnTargets="$(ResolveNuGetPackageAssetsDependsOn)"
Condition="'$(ResolveNuGetPackages)' == 'true' and exists('$(ProjectLockFile)')">
<ResolveNuGetPackageAssetsPatched AllowFallbackOnTargetSelection="$(DesignTimeBuild)"
ContinueOnError="$(ContinueOnError)"
IncludeFrameworkReferences="$(IncludeFrameworkReferencesFromNuGet)"
NuGetPackagesDirectory="$(NuGetPackagesDirectory)"
RuntimeIdentifier="$(NuGetRuntimeIdentifier)"
ProjectLanguage="$(Language)"
ProjectLockFile="$(ProjectLockFile)"
ContentPreprocessorValues="@(NuGetPreprocessorValue)"
ContentPreprocessorOutputDirectory="$(IntermediateOutputPath)\NuGet"
TargetMonikers="$(NuGetTargetMoniker);$(_NuGetTargetFallbackMoniker)">
<Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
<Output TaskParameter="ResolvedCopyLocalItems" ItemName="ReferenceCopyLocalPaths" />
<Output TaskParameter="ResolvedReferences" ItemName="_ReferencesFromNuGetPackages" />
<Output TaskParameter="ReferencedPackages" ItemName="ReferencedNuGetPackages" />
<Output TaskParameter="ContentItems" ItemName="_NuGetContentItems" />
<Output TaskParameter="FileWrites" ItemName="FileWrites" />
</ResolveNuGetPackageAssetsPatched>
<ItemGroup>
<!-- Remove exact references, such as if a package had a framework reference to 'System' that we already have -->
<Reference Remove="@(_ReferencesFromNuGetPackages)" />
<!-- Remove simple name references that are already implicitly added -->
<_ReferencesFromNuGetPackages Remove="%(ReferencePath.FileName)" Condition="'%(ReferencePath.ResolvedFrom)' == 'ImplicitlyExpandTargetFramework'" />
<!-- Include NuGet references in the proper groups. Project-to-project references must go in the
_ResolvedProjectReferencePaths group which matches the behavior of the ResolveProjectReferences
target. This ensures that even if the assembly is missing on disk, it still makes it to the compiler. -->
<Reference Include="@(_ReferencesFromNuGetPackages)" Condition="'%(_ReferencesFromNuGetPackages.NuGetSourceType)' != 'Project'" />
<_ResolvedProjectReferencePaths Include="@(_ReferencesFromNuGetPackages)" Condition="'%(_ReferencesFromNuGetPackages.NuGetSourceType)' == 'Project'" />
<Reference Include="@(_ReferencesFromNuGetPackages)" />
<!-- Remove simple name references if we're directly providing a reference assembly to the compiler. For example,
consider a project with an Reference Include="System", and some NuGet package is providing System.dll -->
<Reference Remove="%(_ReferencesFromNuGetPackages.FileName)" Condition="'%(_ReferencesFromNuGetPackages.NuGetIsFrameworkReference)' == 'false'"/>
</ItemGroup>
<PropertyGroup Condition=" '$(AutoUnifyAssemblyReferences)' == 'true' ">
<!-- Normally Design Time Assembly Resolution (DTAR) won't consider these references.
Put DTAR in a mode where it will prefer the output of RAR and unify. -->
<DTARUseReferencesFromProject>true</DTARUseReferencesFromProject>
</PropertyGroup>
<!-- The items in _NuGetContentItems need to go into the appropriately-named item group, but the names depend upon the items
themselves. Split it apart. -->
<CreateItem Include="@(_NuGetContentItems)" Condition="'@(_NuGetContentItems)' != ''">
<Output TaskParameter="Include" ItemName="%(_NuGetContentItems.NuGetItemType)" />
</CreateItem>
</Target>
<PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'">
<CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
</PropertyGroup>
</Project>

1
src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj

@ -86,5 +86,4 @@
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\build\SkiaSharp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
src/Skia/Avalonia.Skia.Desktop/Avalonia.Skia.Desktop.csproj

@ -109,5 +109,4 @@
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\SkiaSharp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

4
src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj

@ -88,5 +88,7 @@
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\build\SkiaSharp.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
<PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'">
<CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
</PropertyGroup>
</Project>

1
src/Windows/Avalonia.Designer/Avalonia.Designer.csproj

@ -123,5 +123,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\JetBrains.Annotations.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
src/Windows/Avalonia.Direct2D1/Avalonia.Direct2D1.csproj

@ -117,5 +117,4 @@
<Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\SharpDX.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
src/Windows/Avalonia.Win32/Avalonia.Win32.csproj

@ -101,5 +101,4 @@
<Import Project="Avalonia.Win32.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

4
src/iOS/Avalonia.iOS/Avalonia.iOS.csproj

@ -105,5 +105,7 @@
<Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
<PropertyGroup Condition="'$(UseRoslynPathHack)' == 'true'">
<CscToolPath>$(MSBuildToolsPath)\..\Roslyn</CscToolPath>
</PropertyGroup>
</Project>

1
src/iOS/Avalonia.iOSTestApplication/Avalonia.iOSTestApplication.csproj

@ -187,5 +187,4 @@
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.Benchmarks/Avalonia.Benchmarks.csproj

@ -103,5 +103,4 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.8" />
</ItemGroup>
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.DesignerSupport.TestApp/Avalonia.DesignerSupport.TestApp.csproj

@ -147,5 +147,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.DesignerSupport.Tests/Avalonia.DesignerSupport.Tests.csproj

@ -58,5 +58,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.Direct2D1.UnitTests/Avalonia.Direct2D1.UnitTests.csproj

@ -92,5 +92,4 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.LeakTests/Avalonia.LeakTests.csproj

@ -122,5 +122,4 @@
<Import Project="..\..\build\Moq.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.RenderTests/Avalonia.Cairo.RenderTests.csproj

@ -102,5 +102,4 @@
<Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.RenderTests/Avalonia.Direct2D1.RenderTests.csproj

@ -101,5 +101,4 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

1
tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj

@ -102,5 +102,4 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\..\build\Magick.NET-Q16-AnyCPU.props" />
<Import Project="..\..\build\XUnit.props" />
<Import Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
</Project>

4
tests/Avalonia.UnitTests/Avalonia.UnitTests.csproj

@ -52,5 +52,7 @@
<Import Project="..\..\build\Moq.props" />
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\XUnit.props" />
<Import Condition="'$(TargetFramework)' == 'net461'" Project="$(MSBuildThisFileDirectory)..\..\src\Shared\nuget.workaround.targets" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
</ItemGroup>
</Project>
Loading…
Cancel
Save