From 2ac9709d2d9e405e94e992ca1734a3cc78902f2a Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 14:39:08 -0700 Subject: [PATCH 01/16] Fixed nuget errors --- Directory.Packages.props | 4 ++-- EssentialCSharp.Web/EssentialCSharp.Web.csproj | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 677ccd53..a1fbafa5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,14 @@ true false - true + false 1.1.1.4318 - + diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj index 11731fb3..50129f7f 100644 --- a/EssentialCSharp.Web/EssentialCSharp.Web.csproj +++ b/EssentialCSharp.Web/EssentialCSharp.Web.csproj @@ -1,15 +1,18 @@  net8.0 - true + false - + + + + From d3cff7fd717963b2a93e933fb33c485cc55f2de6 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 14:39:35 -0700 Subject: [PATCH 02/16] Book image is now clickable --- EssentialCSharp.Web/Views/Home/Home.cshtml | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialCSharp.Web/Views/Home/Home.cshtml b/EssentialCSharp.Web/Views/Home/Home.cshtml index bbd0b2fa..6f957212 100644 --- a/EssentialCSharp.Web/Views/Home/Home.cshtml +++ b/EssentialCSharp.Web/Views/Home/Home.cshtml @@ -28,6 +28,7 @@
From 790b5c4cf08f1ccf531827305017ff10b0865b1a Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 15:00:54 -0700 Subject: [PATCH 03/16] Nested img in anchor --- EssentialCSharp.Web/Views/Home/Home.cshtml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialCSharp.Web/Views/Home/Home.cshtml b/EssentialCSharp.Web/Views/Home/Home.cshtml index 6f957212..1632f185 100644 --- a/EssentialCSharp.Web/Views/Home/Home.cshtml +++ b/EssentialCSharp.Web/Views/Home/Home.cshtml @@ -28,8 +28,9 @@
From b52df5dac2ec358f82a8831bd78582b3f0c67ffe Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 15:01:10 -0700 Subject: [PATCH 04/16] Book image is now clickable Nested img in anchor --- EssentialCSharp.Web/Views/Home/Home.cshtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/EssentialCSharp.Web/Views/Home/Home.cshtml b/EssentialCSharp.Web/Views/Home/Home.cshtml index bbd0b2fa..1632f185 100644 --- a/EssentialCSharp.Web/Views/Home/Home.cshtml +++ b/EssentialCSharp.Web/Views/Home/Home.cshtml @@ -28,7 +28,9 @@
- Essential C Sharp Book + + Essential C Sharp Book +
From 0206cb95a2dc73ede8b1314b11d76f4a53176b3c Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 15:36:18 -0700 Subject: [PATCH 05/16] Revert "Fixed nuget errors" This reverts commit 2ac9709d2d9e405e94e992ca1734a3cc78902f2a. --- Directory.Packages.props | 4 ++-- EssentialCSharp.Web/EssentialCSharp.Web.csproj | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a1fbafa5..677ccd53 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,14 @@ true false - false + true 1.1.1.4318 + - diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj index 50129f7f..11731fb3 100644 --- a/EssentialCSharp.Web/EssentialCSharp.Web.csproj +++ b/EssentialCSharp.Web/EssentialCSharp.Web.csproj @@ -1,18 +1,15 @@  net8.0 - false + true - - - - + From 8b0ef2811343619e2b66b9d55d0d67d1484aa024 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Thu, 3 Oct 2024 15:43:11 -0700 Subject: [PATCH 06/16] Reapply "Fixed nuget errors" This reverts commit 0206cb95a2dc73ede8b1314b11d76f4a53176b3c. --- Directory.Packages.props | 4 ++-- EssentialCSharp.Web/EssentialCSharp.Web.csproj | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 677ccd53..a1fbafa5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,14 @@ true false - true + false 1.1.1.4318 - + diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj index 11731fb3..50129f7f 100644 --- a/EssentialCSharp.Web/EssentialCSharp.Web.csproj +++ b/EssentialCSharp.Web/EssentialCSharp.Web.csproj @@ -1,15 +1,18 @@  net8.0 - true + false - + + + + From 5896f3d119866ad01fbff44c59a444899d120a9a Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Mon, 7 Oct 2024 14:51:41 -0700 Subject: [PATCH 07/16] Revert "Reapply "Fixed nuget errors"" This reverts commit 8b0ef2811343619e2b66b9d55d0d67d1484aa024. --- Directory.Packages.props | 4 ++-- EssentialCSharp.Web/EssentialCSharp.Web.csproj | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a1fbafa5..677ccd53 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,14 @@ true false - false + true 1.1.1.4318 + - diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj index 50129f7f..11731fb3 100644 --- a/EssentialCSharp.Web/EssentialCSharp.Web.csproj +++ b/EssentialCSharp.Web/EssentialCSharp.Web.csproj @@ -1,18 +1,15 @@  net8.0 - false + true - - - - + From cff1e0fd277d811c930e88c631f82f0f34a4cf96 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Mon, 7 Oct 2024 14:53:44 -0700 Subject: [PATCH 08/16] Made book cover clickable in /about page --- EssentialCSharp.Web/Views/Home/About.cshtml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/EssentialCSharp.Web/Views/Home/About.cshtml b/EssentialCSharp.Web/Views/Home/About.cshtml index 82504131..81210bee 100644 --- a/EssentialCSharp.Web/Views/Home/About.cshtml +++ b/EssentialCSharp.Web/Views/Home/About.cshtml @@ -37,7 +37,9 @@
- Essential C Sharp Book + + Essential C Sharp Book +
From b1b3a4fd5e894d106da3c5714241915fe77c4e47 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Mon, 7 Oct 2024 16:57:34 -0700 Subject: [PATCH 09/16] Messing with configuration to disable inaccessible nuget feed --- Directory.Build.props | 1 + Directory.Packages.props | 3 +-- EssentialCSharp.Web/EssentialCSharp.Web.csproj | 5 +++-- nuget.config | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0df9b2bf..665e0f98 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,6 +7,7 @@ true true Linux + false True diff --git a/Directory.Packages.props b/Directory.Packages.props index 677ccd53..e2a0f1b4 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,14 +2,13 @@ true false - true 1.1.1.4318 - + diff --git a/EssentialCSharp.Web/EssentialCSharp.Web.csproj b/EssentialCSharp.Web/EssentialCSharp.Web.csproj index 11731fb3..501be8cb 100644 --- a/EssentialCSharp.Web/EssentialCSharp.Web.csproj +++ b/EssentialCSharp.Web/EssentialCSharp.Web.csproj @@ -1,15 +1,16 @@  net8.0 - true + + + - diff --git a/nuget.config b/nuget.config index 65bcde44..22de92dc 100644 --- a/nuget.config +++ b/nuget.config @@ -6,6 +6,9 @@ + + + From ff84cd8cad3ef55e07758fca87e03c20b8885533 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Mon, 7 Oct 2024 17:15:46 -0700 Subject: [PATCH 10/16] Re-enable nuget feed for PR --- Directory.Build.props | 2 +- nuget.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 665e0f98..1dd77e31 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -7,7 +7,7 @@ true true Linux - false + true True diff --git a/nuget.config b/nuget.config index 22de92dc..fe1df41b 100644 --- a/nuget.config +++ b/nuget.config @@ -7,7 +7,7 @@ - + From fa38c68f9ac778c60721e42ef68923b5915f9513 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 8 Oct 2024 08:29:08 -0700 Subject: [PATCH 11/16] Added MSBuild conditional to nuget.config --- nuget.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuget.config b/nuget.config index fe1df41b..e2a08b86 100644 --- a/nuget.config +++ b/nuget.config @@ -7,7 +7,7 @@ - + From fb78d5dc96a610b210112e5940b65d8ddcd9b816 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 8 Oct 2024 14:18:31 -0700 Subject: [PATCH 12/16] Ignores going to previous page when at /home --- EssentialCSharp.Web/wwwroot/js/site.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js index c76f5c54..2271fda2 100644 --- a/EssentialCSharp.Web/wwwroot/js/site.js +++ b/EssentialCSharp.Web/wwwroot/js/site.js @@ -152,7 +152,10 @@ const app = createApp({ } function goToPrevious() { - window.location.href = "/" + PREVIOUS_PAGE; + debugger; + if (!window.location.href.endsWith("/home")) { + window.location.href = "/" + PREVIOUS_PAGE; + } } function goToNext() { window.location.href = "/" + NEXT_PAGE; From d6f246870136dd1dbefcb284ecd25448cc68dd0b Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 8 Oct 2024 14:33:08 -0700 Subject: [PATCH 13/16] remove debugger --- EssentialCSharp.Web/wwwroot/js/site.js | 1 - 1 file changed, 1 deletion(-) diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js index 2271fda2..c10bd58b 100644 --- a/EssentialCSharp.Web/wwwroot/js/site.js +++ b/EssentialCSharp.Web/wwwroot/js/site.js @@ -152,7 +152,6 @@ const app = createApp({ } function goToPrevious() { - debugger; if (!window.location.href.endsWith("/home")) { window.location.href = "/" + PREVIOUS_PAGE; } From fb3192e8b3cdc396db385198f61bdd575678bb40 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 8 Oct 2024 15:01:52 -0700 Subject: [PATCH 14/16] Revert "remove debugger" This reverts commit d6f246870136dd1dbefcb284ecd25448cc68dd0b. --- EssentialCSharp.Web/wwwroot/js/site.js | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js index c10bd58b..2271fda2 100644 --- a/EssentialCSharp.Web/wwwroot/js/site.js +++ b/EssentialCSharp.Web/wwwroot/js/site.js @@ -152,6 +152,7 @@ const app = createApp({ } function goToPrevious() { + debugger; if (!window.location.href.endsWith("/home")) { window.location.href = "/" + PREVIOUS_PAGE; } From 012452a1ab2c560f733fec7d56f7d13b4fa60fd0 Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 8 Oct 2024 15:02:04 -0700 Subject: [PATCH 15/16] Revert "Ignores going to previous page when at /home" This reverts commit fb78d5dc96a610b210112e5940b65d8ddcd9b816. --- EssentialCSharp.Web/wwwroot/js/site.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/EssentialCSharp.Web/wwwroot/js/site.js b/EssentialCSharp.Web/wwwroot/js/site.js index 2271fda2..c76f5c54 100644 --- a/EssentialCSharp.Web/wwwroot/js/site.js +++ b/EssentialCSharp.Web/wwwroot/js/site.js @@ -152,10 +152,7 @@ const app = createApp({ } function goToPrevious() { - debugger; - if (!window.location.href.endsWith("/home")) { - window.location.href = "/" + PREVIOUS_PAGE; - } + window.location.href = "/" + PREVIOUS_PAGE; } function goToNext() { window.location.href = "/" + NEXT_PAGE; From 529a94bd820b96c42f2239bf7c7c4ed31bfd068d Mon Sep 17 00:00:00 2001 From: Joshua Lester Date: Tue, 15 Oct 2024 15:08:23 -0700 Subject: [PATCH 16/16] Conditionally restore private nuget feed source in .props --- Directory.Packages.props | 9 ++++++++- nuget.config | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f26ae37b..b35a39ca 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,20 @@ true false 1.1.1.4359 + + https://pkgs.dev.azure.com/intelliTect/_packaging/EssentialCSharp/nuget/v3/index.json; + + + $(RestoreSources); + https://api.nuget.org/v3/index.json; + + - diff --git a/nuget.config b/nuget.config index e2a08b86..65bcde44 100644 --- a/nuget.config +++ b/nuget.config @@ -6,9 +6,6 @@ - - -