diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj index 53f67b96..009eeeaf 100644 --- a/Octokit.Reactive/Octokit.Reactive.csproj +++ b/Octokit.Reactive/Octokit.Reactive.csproj @@ -6,7 +6,7 @@ GitHub 0.0.0-dev true - netstandard1.1;netstandard2.0;net45;net46 + netstandard2.0;net46 Octokit.Reactive Octokit.Reactive embedded @@ -19,10 +19,6 @@ Copyright GitHub 2017 - - 1.6.0 - - 2.0.0 @@ -45,12 +41,11 @@ - + - - + diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj index 7f870ff2..29004e53 100644 --- a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj +++ b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj @@ -4,7 +4,7 @@ Convention-based tests for Octokit Octokit.Tests.Conventions GitHub - netcoreapp3.1;net452 + netcoreapp3.1;net46 $(NoWarn);CS4014;CS1998 Octokit.Tests.Conventions Octokit.Tests.Conventions @@ -38,7 +38,7 @@ - + diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj index 29e43af0..be985d6a 100644 --- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj +++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj @@ -4,7 +4,7 @@ Integration tests for Octokit Octokit.Tests.Integration GitHub - netcoreapp3.1;net452 + netcoreapp3.1;net46 $(NoWarn);CS4014;CS1998 Octokit.Tests.Integration Octokit.Tests.Integration @@ -37,6 +37,7 @@ + @@ -49,7 +50,7 @@ - + diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj index f5dcb2c7..96f20132 100644 --- a/Octokit.Tests/Octokit.Tests.csproj +++ b/Octokit.Tests/Octokit.Tests.csproj @@ -4,7 +4,7 @@ Tests for Octokit Octokit.Tests GitHub - netcoreapp3.1;net452 + netcoreapp3.1;net46 $(NoWarn);CS4014;CS1998 Octokit.Tests Octokit.Tests @@ -38,11 +38,12 @@ + - + diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index 1d630453..392dcb58 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -6,7 +6,7 @@ GitHub 0.0.0-dev true - netstandard1.1;netstandard2.0;net45;net46 + netstandard2.0;net46 Octokit Octokit embedded @@ -19,20 +19,12 @@ Copyright GitHub 2017 - - $(DefineConstants);HAS_TYPEINFO;SIMPLE_JSON_INTERNAL;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_READONLY_COLLECTIONS;SIMPLE_JSON_TYPEINFO - - - - $(DefineConstants);NO_SERIALIZABLE - 1.6.0 - - + $(DefineConstants);HAS_TYPEINFO;SIMPLE_JSON_INTERNAL;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_READONLY_COLLECTIONS;SIMPLE_JSON_TYPEINFO 2.0.0 - + $(DefineConstants);HAS_ENVIRONMENT;HAS_REGEX_COMPILED_OPTIONS;SIMPLE_JSON_INTERNAL;SIMPLE_JSON_OBJARRAYINTERNAL;SIMPLE_JSON_READONLY_COLLECTIONS;HAS_SERVICEPOINTMANAGER @@ -40,7 +32,7 @@ 1591;1701;1702;1705 - + diff --git a/build/Tasks/CodeCoverage.cs b/build/Tasks/CodeCoverage.cs index e972a121..474ac88d 100644 --- a/build/Tasks/CodeCoverage.cs +++ b/build/Tasks/CodeCoverage.cs @@ -40,7 +40,7 @@ public sealed class CodeCoverage : FrostingTask context.Coverlet(project, new CoverletToolSettings { Configuration = context.Configuration, - Framework = "net452", + Framework = "net46", Output = dotNetFrameworkCoverage.FullPath }); } diff --git a/build/Tasks/ValidateLINQPadSamples.cs b/build/Tasks/ValidateLINQPadSamples.cs index 860a38d8..b196c6d7 100644 --- a/build/Tasks/ValidateLINQPadSamples.cs +++ b/build/Tasks/ValidateLINQPadSamples.cs @@ -17,7 +17,7 @@ public sealed class ValidateLINQPadSamples : FrostingTask .Combine("Octokit.Reactive") .Combine("bin") .Combine(context.Configuration) - .Combine("net45") + .Combine("net46") .MakeAbsolute(context.Environment) .FullPath; @@ -80,12 +80,10 @@ public sealed class ValidateLINQPadSamples : FrostingTask using (var writer = new StreamWriter(stream)) { // reference all known assemblies - writer.WriteLine("ref {0}\\System.Reactive.Core.dll;", directory); - writer.WriteLine("ref {0}\\System.Reactive.Interfaces.dll;", directory); - writer.WriteLine("ref {0}\\System.Reactive.Linq.dll;", directory); + writer.WriteLine("ref {0}\\System.Reactive.dll;", directory); writer.WriteLine("ref {0}\\Octokit.dll;", directory); writer.WriteLine("ref {0}\\Octokit.Reactive.dll;", directory); - writer.WriteLine("ref C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.5\\System.Net.Http.dll;"); + writer.WriteLine("ref C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6\\System.Net.Http.dll;"); writer.WriteLine(); var xmlText = text.Substring(openTagIndex, endOfMetadata); diff --git a/tools/LINQPad/LINQPad.exe b/tools/LINQPad/LINQPad.exe index 67ac8604..a87cedcb 100644 Binary files a/tools/LINQPad/LINQPad.exe and b/tools/LINQPad/LINQPad.exe differ diff --git a/tools/LINQPad/LINQPad.exe.config b/tools/LINQPad/LINQPad.exe.config index 925cb332..3508552a 100644 --- a/tools/LINQPad/LINQPad.exe.config +++ b/tools/LINQPad/LINQPad.exe.config @@ -1,16 +1,48 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/LINQPad/lprun readme.txt b/tools/LINQPad/lprun readme.txt new file mode 100644 index 00000000..1683e1c0 --- /dev/null +++ b/tools/LINQPad/lprun readme.txt @@ -0,0 +1,9 @@ +LPRun.exe is the command-line version of LINQPad. Call LPRun with no arguments for help. + +You can improve startup performance by generating native images for the Roslyn assemblies. +To do this, open the administrator command prompt, and call: + + LINQPad.exe -ngen + +This generates local native images that will be used by both LPRun.exe and LINQPad.exe. +It does not install anything to the GAC. \ No newline at end of file diff --git a/tools/LINQPad/lprun.exe b/tools/LINQPad/lprun.exe index d989e563..ca72b964 100644 Binary files a/tools/LINQPad/lprun.exe and b/tools/LINQPad/lprun.exe differ diff --git a/tools/LINQPad/lprun.exe.config b/tools/LINQPad/lprun.exe.config index 925cb332..4fe13b66 100644 --- a/tools/LINQPad/lprun.exe.config +++ b/tools/LINQPad/lprun.exe.config @@ -1,16 +1,48 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file