diff --git a/.github/workflows/build-samples.yml b/.github/workflows/build-samples.yml
index 65f88b0..c5b9bc2 100644
--- a/.github/workflows/build-samples.yml
+++ b/.github/workflows/build-samples.yml
@@ -20,8 +20,6 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "ReactiveUI"
- useVisualStudioPreview: false
- useMauiCheckDotNetTool: false
srcFolder: 'integrationtests'
solutionFile: 'IntegrationTests.All.sln'
performTests: false
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 90ef074..996ce3f 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -20,7 +20,4 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "ReactiveUI"
- dotNetBuild: true
- useVisualStudioPreview: false
- useMauiCheckDotNetTool: false
solutionFile: "ReactiveUI.Maui.Plugins.Popup.sln"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4c869ce..0fc6366 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,9 +15,6 @@ jobs:
with:
configuration: Release
productNamespacePrefix: "ReactiveUI"
- dotNetBuild: true
- useVisualStudioPreview: false
- useMauiCheckDotNetTool: false
solutionFile: "ReactiveUI.Maui.Plugins.Popup.sln"
secrets:
SIGN_CLIENT_USER_ID: ${{ secrets.SIGN_CLIENT_USER_ID }}
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 9de0255..8a96cc4 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -4,7 +4,7 @@
true
-
+
@@ -22,8 +22,8 @@
-
-
+
+
diff --git a/src/ReactiveUI.Maui.Plugins.Popup.sln b/src/ReactiveUI.Maui.Plugins.Popup.sln
index 6e63e0f..213dba2 100644
--- a/src/ReactiveUI.Maui.Plugins.Popup.sln
+++ b/src/ReactiveUI.Maui.Plugins.Popup.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
+# 17
VisualStudioVersion = 17.10.34916.146
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Maui.Plugins.Popup", "ReactiveUI.Maui.Plugins.Popup\ReactiveUI.Maui.Plugins.Popup.csproj", "{3AB0DD06-D29C-40A3-9BB4-7F98B68A49A1}"
@@ -7,17 +7,17 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionConfig", "SolutionConfig", "{D7DEFA90-ABB2-4B15-B882-FD045EF63844}"
ProjectSection(SolutionItems) = preProject
..\.editorconfig = ..\.editorconfig
- ..\README.md = ..\README.md
- ..\version.json = ..\version.json
Directory.build.props = Directory.build.props
Directory.Packages.props = Directory.Packages.props
- global.json = global.json
+ ..\README.md = ..\README.md
stylecop.json = stylecop.json
+ ..\version.json = ..\version.json
EndProjectSection
EndProject
Global
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {60209B6D-CF1E-4D77-B9A9-4A189806F70F}
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3AB0DD06-D29C-40A3-9BB4-7F98B68A49A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -25,11 +25,10 @@ Global
{3AB0DD06-D29C-40A3-9BB4-7F98B68A49A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3AB0DD06-D29C-40A3-9BB4-7F98B68A49A1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {60209B6D-CF1E-4D77-B9A9-4A189806F70F}
+ EndGlobalSection
EndGlobal
diff --git a/src/global.json b/src/global.json
deleted file mode 100644
index 4c31281..0000000
--- a/src/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "sdk": {
- "version": "8.0.10",
- "rollForward": "latestMinor"
- }
-}