diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 4aecb4ebff..df8f45c236 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -26,7 +26,6 @@ "enum": [ "Clean", "Compile", - "InstallDependencies", "Pack", "Publish", "Restore", diff --git a/Directory.Packages.props b/Directory.Packages.props index 4907a17fca..92ae77015f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -34,6 +34,8 @@ + + diff --git a/build/Build.Pack.cs b/build/Build.Pack.cs index 7a5cc8c43c..1e4966f9ec 100644 --- a/build/Build.Pack.cs +++ b/build/Build.Pack.cs @@ -7,11 +7,9 @@ using Nuke.Common.IO; using Nuke.Common.Tooling; using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.MSBuild; using Nuke.Common.Tools.NuGet; using static Nuke.Common.Tools.DotNet.DotNetTasks; -using static Nuke.Common.Tools.MSBuild.MSBuildTasks; using static Nuke.Common.Tools.NuGet.NuGetTasks; using Project = Microsoft.Build.Evaluation.Project; @@ -60,9 +58,8 @@ public partial class Build .SetVersion(nugetVersion) .SetConfiguration(Configuration) .SetOutputDirectory(ArtifactsDirectory) - .SetDeterministic(IsServerBuild) - .SetContinuousIntegrationBuild(IsServerBuild) .EnableNoRestore() + .EnableNoBuild() ); } @@ -70,18 +67,11 @@ public partial class Build (SourceDirectory / "NSwagStudio.Installer" / "bin").CreateOrCleanDirectory(); - MSBuild(x => x - .SetTargetPath(GetProject("NSwagStudio.Installer")) - .SetTargets("Rebuild") - .SetAssemblyVersion(VersionPrefix) - .SetFileVersion(VersionPrefix) - .SetInformationalVersion(VersionPrefix) + DotNetBuild(x => x + .SetProjectFile(GetProject("NSwagStudio.Installer")) .SetConfiguration(Configuration) - .SetMaxCpuCount(Environment.ProcessorCount) - .SetNodeReuse(IsLocalBuild) - .SetVerbosity(MSBuildVerbosity.Minimal) - .SetProperty("Deterministic", IsServerBuild) - .SetProperty("ContinuousIntegrationBuild", IsServerBuild) + .EnableNoRestore() + .SetVerbosity(DotNetVerbosity.minimal) ); // gather relevant artifacts diff --git a/build/Build.cs b/build/Build.cs index 6f977c4c9d..2707f74bb3 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -11,14 +11,9 @@ using Nuke.Common.ProjectModel; using Nuke.Common.Tooling; using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.MSBuild; -using Nuke.Common.Tools.Npm; using Nuke.Common.Utilities; using Nuke.Common.Utilities.Collections; - -using static Nuke.Common.Tools.Chocolatey.ChocolateyTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; -using static Nuke.Common.Tools.MSBuild.MSBuildTasks; using static Nuke.Common.Tools.Npm.NpmTasks; using Project = Nuke.Common.ProjectModel.Project; @@ -127,18 +122,6 @@ protected override void OnBuildInitialized() ArtifactsDirectory.CreateOrCleanDirectory(); }); - Target InstallDependencies => _ => _ - .Before(Restore, Compile) - .OnlyWhenDynamic(() => !IsServerBuild) - .Executes(() => - { - Chocolatey("install wixtoolset -y"); - NpmInstall(x => x - .EnableGlobal() - .AddPackages("dotnettools") - ); - }); - Target Restore => _ => _ .Executes(() => { @@ -163,60 +146,21 @@ protected override void OnBuildInitialized() Serilog.Log.Information("Build and copy full .NET command line with configuration {Configuration}", Configuration); - if (IsRunningOnWindows) - { - DotNetMSBuild(x => x - .SetTargetPath(GetProject("NSwagStudio")) - .SetAssemblyVersion(VersionPrefix) - .SetFileVersion(VersionPrefix) - .SetInformationalVersion(VersionPrefix) - .SetConfiguration(Configuration) - .SetMaxCpuCount(Environment.ProcessorCount) - .SetNodeReuse(IsLocalBuild) - .SetVerbosity(DotNetVerbosity.minimal) - .SetDeterministic(IsServerBuild) - .SetContinuousIntegrationBuild(IsServerBuild) - // ensure we don't generate too much output in CI run - // 0 Turns off emission of all warning messages - // 1 Displays severe warning messages - .SetWarningLevel(IsServerBuild ? 0 : 1) - ); - - MSBuild(x => x - .SetTargetPath(SolutionFile) - .SetAssemblyVersion(VersionPrefix) - .SetFileVersion(VersionPrefix) - .SetInformationalVersion(VersionPrefix) - .SetConfiguration(Configuration) - .SetMaxCpuCount(Environment.ProcessorCount) - .SetNodeReuse(IsLocalBuild) - .SetVerbosity(MSBuildVerbosity.Minimal) - .SetProperty("Deterministic", IsServerBuild) - .SetProperty("ContinuousIntegrationBuild", IsServerBuild) - // ensure we don't generate too much output in CI run - // 0 Turns off emission of all warning messages - // 1 Displays severe warning messages - .SetWarningLevel(IsServerBuild ? 0 : 1) - ); - } - else - { - DotNetBuild(x => x - .SetProjectFile(SolutionFile) - .SetAssemblyVersion(VersionPrefix) - .SetFileVersion(VersionPrefix) - .SetInformationalVersion(VersionPrefix) - .SetConfiguration(Configuration) - .SetVerbosity(DotNetVerbosity.minimal) - .SetDeterministic(IsServerBuild) - .SetContinuousIntegrationBuild(IsServerBuild) - // ensure we don't generate too much output in CI run - // 0 Turns off emission of all warning messages - // 1 Displays severe warning messages - .SetWarningLevel(IsServerBuild ? 0 : 1) - .EnableNoRestore() - ); - } + DotNetBuild(x => x + .SetProjectFile(SolutionFile) + .SetAssemblyVersion(VersionPrefix) + .SetFileVersion(VersionPrefix) + .SetInformationalVersion(VersionPrefix) + .SetConfiguration(Configuration) + .SetVerbosity(DotNetVerbosity.minimal) + .SetDeterministic(IsServerBuild) + .SetContinuousIntegrationBuild(IsServerBuild) + // ensure we don't generate too much output in CI run + // 0 Turns off emission of all warning messages + // 1 Displays severe warning messages + .SetWarningLevel(IsServerBuild ? 0 : 1) + .EnableNoRestore() + ); // later steps need to have binaries in correct places PublishAndCopyConsoleProjects(); diff --git a/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj b/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj index f138da0206..a594cd19f2 100644 --- a/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj +++ b/src/NSwagStudio.Installer/NSwagStudio.Installer.wixproj @@ -1,58 +1,24 @@ - - + + - 3.10 - 50dcc09c-7349-4bac-8833-261a641e0669 - 2.0 NSwagStudio - Package - - - ICE69 + ICE61;ICE69 ..\..\artifacts\bin\NSwagStudio.Installer\$(Configuration)\ ..\..\artifacts\obj\NSwagStudio.Installer\$(Configuration)\ + SourcePath=..\..\NSwagStudio\$(Configuration) - - - - + NSwagStudio - {dada2d11-14e2-40b1-b31d-b68d6f18378c} - True - True Binaries;Content;Satellites INSTALLFOLDER + - - $(WixExtDir)\WixUtilExtension.dll - WixUtilExtension - - - $(WixExtDir)\WixUIExtension.dll - WixUIExtension - + + - - - - - SourcePath=..\..\artifacts\bin\NSwagStudio\$(Configuration) - - - - \ No newline at end of file + + diff --git a/src/NSwagStudio.Installer/Product.wxs b/src/NSwagStudio.Installer/Product.wxs index c80f2ff0b4..cf67e5331e 100644 --- a/src/NSwagStudio.Installer/Product.wxs +++ b/src/NSwagStudio.Installer/Product.wxs @@ -1,91 +1,117 @@ - - - - - - - - - - - - - - - - - - - 1 - 1 - WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/NSwagStudio/NSwagStudio.csproj b/src/NSwagStudio/NSwagStudio.csproj index 5627b7be37..befa3c0857 100644 --- a/src/NSwagStudio/NSwagStudio.csproj +++ b/src/NSwagStudio/NSwagStudio.csproj @@ -25,17 +25,7 @@ - - - - - - - - - - @@ -45,14 +35,8 @@ - - - - - -