From 46fccfea08e8881b83ce23920e340a3e4c4159d0 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 1 Sep 2024 22:19:58 -0400
Subject: [PATCH] GitHub: Hardcode .net version (#16106)
---
.github/workflows/cd-preview.yml | 2 +-
.github/workflows/cd-stable.yml | 2 +-
.github/workflows/ci.yml | 12 ++++++++++--
.github/workflows/format-xaml.yml | 5 +++++
global.json | 5 +++++
src/Files.App (Package)/Package.appxmanifest | 2 +-
6 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 global.json
diff --git a/.github/workflows/cd-preview.yml b/.github/workflows/cd-preview.yml
index 1f7c0881a01c..c3ecd892b555 100644
--- a/.github/workflows/cd-preview.yml
+++ b/.github/workflows/cd-preview.yml
@@ -49,7 +49,7 @@ jobs:
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ global-json-file: global.json
- name: Configure the package manifest, logo, and secrets
shell: pwsh
diff --git a/.github/workflows/cd-stable.yml b/.github/workflows/cd-stable.yml
index e3a45e399ac9..4b82a593abaf 100644
--- a/.github/workflows/cd-stable.yml
+++ b/.github/workflows/cd-stable.yml
@@ -49,7 +49,7 @@ jobs:
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ global-json-file: global.json
- name: Configure the package manifest, logo, and secrets
shell: pwsh
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dce75b89d23b..fe94e1294a6a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,7 +60,11 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 2
-
+ - name: Setup .NET 8
+ uses: actions/setup-dotnet@v4
+ with:
+ global-json-file: global.json
+
- name: Install XamlStyler console
run: 'dotnet tool install --global XamlStyler.Console'
@@ -107,7 +111,7 @@ jobs:
- name: Setup .NET 8
uses: actions/setup-dotnet@v4
with:
- dotnet-version: '8.0.x'
+ global-json-file: global.json
- name: Restore NuGet
shell: pwsh
@@ -205,6 +209,10 @@ jobs:
- name: Checkout the repository
uses: actions/checkout@v4
+ - name: Setup .NET 8
+ uses: actions/setup-dotnet@v4
+ with:
+ global-json-file: global.json
- name: Download the packages from the Artifacts
uses: actions/download-artifact@v4
diff --git a/.github/workflows/format-xaml.yml b/.github/workflows/format-xaml.yml
index 3a514fd24a00..6841504eab3a 100644
--- a/.github/workflows/format-xaml.yml
+++ b/.github/workflows/format-xaml.yml
@@ -46,6 +46,11 @@ jobs:
- uses: actions/checkout@v4
if: env.CAN_RUN == 1
+ - name: Setup .NET 8
+ uses: actions/setup-dotnet@v4
+ with:
+ global-json-file: global.json
+
- name: Set git identity
if: env.CAN_RUN == 1
run: |
diff --git a/global.json b/global.json
new file mode 100644
index 000000000000..62a1920fd79d
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
+{
+ "sdk": {
+ "version": "8.0.303"
+ }
+}
diff --git a/src/Files.App (Package)/Package.appxmanifest b/src/Files.App (Package)/Package.appxmanifest
index daad40c50b44..29cf449d2b94 100644
--- a/src/Files.App (Package)/Package.appxmanifest
+++ b/src/Files.App (Package)/Package.appxmanifest
@@ -16,7 +16,7 @@
+ Version="3.6.17.0" />
Files - Dev