Skip to content

Update gradle builds #281

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
timotei merged 17 commits into from
Feb 22, 2021
Merged

Update gradle builds #281

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4517483
Update gradle builds
ngyukman Feb 19, 2021
18a7cfb
Update gradle wrapper
ngyukman Feb 19, 2021
b0af03a
try downgrade vs
ngyukman Feb 19, 2021
df5c5d9
Fix unit test
ngyukman Feb 19, 2021
c646ca6
Update RepackNuGetTests.cs
ngyukman Feb 19, 2021
f6d6c3f
Fix unit test packages path
ngyukman Feb 19, 2021
40161c7
Fix build.gradle indentation
timotei Feb 19, 2021
81e89ce
Update ILRepack.Tests.csproj
ngyukman Feb 19, 2021
6aea53b
Merge branch 'master' of https://github.com/ngyukman/il-repack
ngyukman Feb 19, 2021
ceb0570
Try again on Visual Studio 2019 image
ngyukman Feb 19, 2021
7b22d5e
Update .travis.yml
ngyukman Feb 20, 2021
db63c92
debug in travis build
ngyukman Feb 20, 2021
51d226a
Try to build with updated gradle-msbuild-plugin
ngyukman Feb 20, 2021
5e5f086
Update .travis.yml
ngyukman Feb 20, 2021
4ec96d0
Update build.gradle
ngyukman Feb 20, 2021
ca35e75
Update build.gradle
ngyukman Feb 20, 2021
e89b566
Add env MSBuildSDKsPath for travis build
ngyukman Feb 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 26 additions & 39 deletions ILRepack.IntegrationTests/ILRepack.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,42 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core, Version=4.4.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="BamlParser, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\BamlParser.1.0.0\lib\net35\BamlParser.dll</HintPath>
</Reference>
<Reference Include="Fasterflect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=38d18473284c1ca7, processorArchitecture=MSIL">
<HintPath>..\packages\fasterflect.2.1.3\lib\net40\Fasterflect.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\net40\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net40\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net40\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net40\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand All @@ -86,9 +50,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Scenarios.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj">
<Project>{d68133bd-1e63-496e-9ede-4fbdbf77b486}</Project>
Expand All @@ -106,5 +67,31 @@
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="BamlParser">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="fasterflect">
<Version>2.1.3</Version>
</PackageReference>
<PackageReference Include="FSharp.Core">
<Version>4.0.0.1</Version>
</PackageReference>
<PackageReference Include="Moq">
<Version>4.2.1409.1722</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>2.6.4</Version>
</PackageReference>
<PackageReference Include="Rx-Main">
<Version>2.2.5</Version>
</PackageReference>
<PackageReference Include="SharpZipLib">
<Version>0.86.0</Version>
</PackageReference>
<PackageReference Include="SourceLink">
<Version>1.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
9 changes: 7 additions & 2 deletions ILRepack.IntegrationTests/NuGet/NuGetHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ namespace ILRepack.IntegrationTests.NuGet
{
static class NuGetHelpers
{
static NuGetHelpers()
{
ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072;
}

private static IObservable<byte[]> CreateDownloadObservable(Uri uri)
{
return Observable.Create<byte[]>(o => {
Expand All @@ -30,7 +35,7 @@ private static IObservable<byte[]> CreateDownloadObservable(Uri uri)
result.OnCompleted();
} else {
if (ep.EventArgs.Error != null) {
result.OnError(ep.EventArgs.Error);
result.OnError(new Exception($"Failed to download from {uri}", ep.EventArgs.Error));
} else {
result.OnNext(ep.EventArgs.Result);
result.OnCompleted();
Expand All @@ -55,7 +60,7 @@ public static IObservable<Tuple<string, Func<Stream>>> GetNupkgAssembliesAsync(P

public static IObservable<Tuple<string, Func<Stream>>> GetNupkgContentAsync(Package package)
{
var o = CreateDownloadObservable(new Uri($"http://nuget.org/api/v2/package/{package.Name}/{package.Version}"));
var o = CreateDownloadObservable(new Uri($"https://www.nuget.org/api/v2/package/{package.Name}/{package.Version}"));
return o.SelectMany(input => {
return Observable.Create<Tuple<ZipFile, ZipEntry>>(observer => {
var z = new ZipFile(new MemoryStream(input)) { IsStreamOwner = true };
Expand Down
5 changes: 2 additions & 3 deletions ILRepack.IntegrationTests/NuGet/RepackNuGetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
using System.Linq;
using System.Reactive.Linq;
using System.Reactive.PlatformServices;
using System.Text.RegularExpressions;
using ILRepacking.Steps.SourceServerData;

namespace ILRepack.IntegrationTests.NuGet
Expand Down Expand Up @@ -170,8 +169,8 @@ private static IEnumerable<string> GetSourceLinks(string pdbName)
UseShellExecute = false,
RedirectStandardOutput = true,
FileName = Path.Combine(
TestContext.CurrentContext.TestDirectory,
@"..\..\..\packages\SourceLink.1.1.0\tools\SourceLink.exe"),
Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
@".nuget\packages\SourceLink\1.1.0\tools\SourceLink.exe"),
Arguments = "srctoolx --pdb " + pdbName
};
using (var sourceLinkProcess = Process.Start(processInfo))
Expand Down
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/AnotherClassLibrary/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/ClassLibrary/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]

[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/DotNet462Application/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("eecc6459-78c6-4a08-9039-de37e75866e6")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/DotNet462NetStandard2/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/LibraryClassUsageInXAML/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/LibraryUserControlUsageInXAML/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/NestedLibraryUsageInXAML/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/WPFSampleApplication/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
4 changes: 2 additions & 2 deletions ILRepack.IntegrationTests/Scenarios/WPFThemingAndLibraryStyles/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
15 changes: 0 additions & 15 deletions ILRepack.IntegrationTests/packages.config
View file
Open in desktop

This file was deleted.

38 changes: 16 additions & 22 deletions ILRepack.Tests/ILRepack.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,8 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="BamlParser, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\BamlParser.1.0.0\lib\net35\BamlParser.dll</HintPath>
</Reference>
<Reference Include="Fasterflect, Version=2.1.3.0, Culture=neutral, PublicKeyToken=38d18473284c1ca7, processorArchitecture=MSIL">
<HintPath>..\packages\fasterflect.2.1.3\lib\net40\Fasterflect.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" Condition=" '$(Configuration)' != 'Debug_unix' " />
Comment thread
ngyukman marked this conversation as resolved.
<Reference Include="PresentationFramework" Condition=" '$(Configuration)' != 'Debug_unix' " />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
Expand All @@ -79,11 +65,6 @@
<Compile Include="Steps\XamlResourcePathPatcherStepTests.cs" />
<Compile Include="Utils\BamlDocumentMatcher.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\cecil\Mono.Cecil.csproj">
<Project>{d68133bd-1e63-496e-9ede-4fbdbf77b486}</Project>
Expand Down Expand Up @@ -135,6 +116,19 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="BamlParser">
<Version>1.0.0</Version>
</PackageReference>
<PackageReference Include="fasterflect">
<Version>2.1.3</Version>
</PackageReference>
<PackageReference Include="Moq">
<Version>4.2.1409.1722</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>2.6.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
4 changes: 2 additions & 2 deletions ILRepack.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.0")]
[assembly: AssemblyFileVersion("2.0.18.0")]
[assembly: AssemblyVersion("2.1.0.0")]
[assembly: AssemblyFileVersion("2.1.0.0")]
7 changes: 0 additions & 7 deletions ILRepack.Tests/packages.config
View file
Open in desktop

This file was deleted.

Loading