diff --git a/DotnetCliVersion.txt b/DotnetCliVersion.txt index e290f404..d7fab98f 100644 --- a/DotnetCliVersion.txt +++ b/DotnetCliVersion.txt @@ -1 +1 @@ -2.2.401 \ No newline at end of file +3.0.100 \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index 6a211e2b..d3000790 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -version: 0.1.3-{build} -image: Visual Studio 2017 +version: 0.0.0-{build} +image: Visual Studio 2019 environment: myget_api_key: secure: 0xJoYAtR6psXCRvk1qm5czDObkeRjHKPjfe5gIExXVFPwA0VVODYv/hBZYUtz2F3 diff --git a/build/Build.cs b/build/Build.cs index 086169bf..141fc93a 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -11,7 +11,7 @@ using System.Xml.Linq; using ICSharpCode.SharpZipLib.Zip; using ILRepacking; using Nuke.Common; -using Nuke.Common.BuildServers; +using Nuke.Common.CI.AppVeyor; using Nuke.Common.Git; using Nuke.Common.IO; using Nuke.Common.ProjectModel; @@ -40,7 +40,7 @@ namespace LibHacBuild AbsolutePath ArtifactsDirectory => RootDirectory / "artifacts"; AbsolutePath SignedArtifactsDirectory => ArtifactsDirectory / "signed"; AbsolutePath TempDirectory => RootDirectory / ".tmp"; - AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_netcoreapp2.1"; + AbsolutePath CliCoreDir => TempDirectory / "hactoolnet_netcoreapp3.0"; AbsolutePath CliFrameworkDir => TempDirectory / "hactoolnet_net46"; AbsolutePath CliNativeDir => TempDirectory / "hactoolnet_native"; AbsolutePath CliFrameworkZip => ArtifactsDirectory / "hactoolnet.zip"; @@ -57,7 +57,7 @@ namespace LibHacBuild string AppVeyorVersion { get; set; } Dictionary VersionProps { get; set; } = new Dictionary(); - private const string MyGetSource = "https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"; + private const string DotNetFeedSource = "https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"; const string CertFileName = "cert.pfx"; private bool IsMasterBranch => _gitVersion?.BranchName.Equals("master") ?? false; @@ -144,7 +144,7 @@ namespace LibHacBuild DotNetPublish(s => publishSettings .SetProject(HactoolnetProject) - .SetFramework("netcoreapp2.1") + .SetFramework("netcoreapp3.0") .SetOutput(CliCoreDir) .SetNoBuild(true) .SetProperties(VersionProps)); @@ -233,7 +233,7 @@ namespace LibHacBuild .EnableNoBuild() .SetConfiguration(Configuration); - if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "netcoreapp2.1"); + if (EnvironmentInfo.IsUnix) settings = settings.SetProperty("TargetFramework", "netcoreapp3.0"); DotNetTest(s => settings); }); @@ -272,7 +272,7 @@ namespace LibHacBuild AbsolutePath nupkgFile = ArtifactsDirectory.GlobFiles("*.nupkg").Single(); AbsolutePath snupkgFile = ArtifactsDirectory.GlobFiles("*.snupkg").Single(); - string apiKey = EnvironmentInfo.Variable("myget_api_key"); + string apiKey = EnvironmentInfo.GetVariable("myget_api_key"); DotNetNuGetPushSettings settings = new DotNetNuGetPushSettings() .SetApiKey(apiKey) .SetSymbolApiKey(apiKey) @@ -298,7 +298,7 @@ namespace LibHacBuild XDocument doc = XDocument.Load(NugetConfig); doc.Element("configuration").Element("packageSources").Add(new XElement("add", - new XAttribute("key", "myget"), new XAttribute("value", MyGetSource))); + new XAttribute("key", "myget"), new XAttribute("value", DotNetFeedSource))); doc.Save(NugetConfig); @@ -309,7 +309,7 @@ namespace LibHacBuild DotNetPublish(s => publishSettings .SetProject(nativeProject) - .SetFramework("netcoreapp2.1") + .SetFramework("netcoreapp3.0") .SetRuntime("win-x64") .SetOutput(CliNativeDir) .SetProperties(VersionProps)); @@ -559,7 +559,7 @@ namespace LibHacBuild // Avoid having multiple signed versions of the same file File.Copy(nupkgDir / "lib" / "net46" / "LibHac.dll", netFxDir / "LibHac.dll", true); - File.Copy(nupkgDir / "lib" / "netcoreapp2.1" / "LibHac.dll", coreFxDir / "LibHac.dll", true); + File.Copy(nupkgDir / "lib" / "netcoreapp3.0" / "LibHac.dll", coreFxDir / "LibHac.dll", true); ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(nupkgFile), nupkgDir, pkgFileList); ZipDirectory(SignedArtifactsDirectory / Path.GetFileName(CliFrameworkZip), netFxDir); diff --git a/build/_build.csproj b/build/_build.csproj index eb229050..3bb692ce 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + netcoreapp3.0 false LibHacBuild False @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/src/LibHac/LibHac.csproj b/src/LibHac/LibHac.csproj index f561d890..5a01d942 100644 --- a/src/LibHac/LibHac.csproj +++ b/src/LibHac/LibHac.csproj @@ -2,7 +2,7 @@ Library - netcoreapp2.1;netstandard2.0;net46 + netcoreapp3.0;netstandard2.0;net46 8.0 @@ -30,7 +30,7 @@ $(DefineConstants);USE_RSA_CNG - + $(DefineConstants);STREAM_SPAN;STRING_SPAN;HAS_FILE_SYSTEM_NAME;CROSS_PLATFORM @@ -49,10 +49,6 @@ - - - - diff --git a/src/hactoolnet/hactoolnet.csproj b/src/hactoolnet/hactoolnet.csproj index bda24881..7c7a3018 100644 --- a/src/hactoolnet/hactoolnet.csproj +++ b/src/hactoolnet/hactoolnet.csproj @@ -2,8 +2,8 @@ Exe - netcoreapp2.1;net46 - 7.3 + netcoreapp3.0;net46 + 8.0 diff --git a/tests/LibHac.Tests/LibHac.Tests.csproj b/tests/LibHac.Tests/LibHac.Tests.csproj index b9308a3a..6d782ac9 100644 --- a/tests/LibHac.Tests/LibHac.Tests.csproj +++ b/tests/LibHac.Tests/LibHac.Tests.csproj @@ -1,13 +1,13 @@  - net46;netcoreapp2.1 + net46;netcoreapp3.0 false - +