From c8da080d2ccda23f74682b03a558210bd42c7730 Mon Sep 17 00:00:00 2001 From: Adam Hathcock Date: Mon, 3 Jun 2024 09:29:35 +0100 Subject: [PATCH] Clean up for build merge. Need global.json to not roll on major versions --- Build/Program.cs | 8 ++++---- DUI3-DX/Directory.Build.Props | 6 +++--- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Build/Program.cs b/Build/Program.cs index fda26ea38a..37675e3a64 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.IO.Compression; -using System.Linq; using Build; using GlobExpressions; using static Bullseye.Targets; @@ -18,13 +17,14 @@ const string RESTORE_TOOLS = "restore-tools"; const string BUILD_SERVER_VERSION = "build-server-version"; -var arguments = new List(); +//need to pass arguments +/*var arguments = new List(); if (args.Length > 1) { arguments = args.ToList(); args = new[] { arguments.First() }; - arguments = arguments.Skip(1).ToList(); -} + //arguments = arguments.Skip(1).ToList(); +}*/ Target( CLEAN, diff --git a/DUI3-DX/Directory.Build.Props b/DUI3-DX/Directory.Build.Props index 64c85531c3..dd2485d9d7 100644 --- a/DUI3-DX/Directory.Build.Props +++ b/DUI3-DX/Directory.Build.Props @@ -9,7 +9,7 @@ - - + + - \ No newline at end of file + diff --git a/global.json b/global.json index 08f229ce09..3cb4f9622d 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "version": "7.0.0", - "rollForward": "latestMajor", + "rollForward": "latestMinor", "allowPrerelease": false } }