Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/build_avalonia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@

jobs:
build-prism-avalonia:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Avalonia
solution-path: PrismLibrary_Avalonia.slnf
test-projects: |
tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj
tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj
dotnet-version: 10.0.100

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
4 changes: 3 additions & 1 deletion .github/workflows/build_core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
test-projects: |
tests/Prism.Core.Tests/Prism.Core.Tests.csproj
dotnet-version: 10.0.100

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
5 changes: 4 additions & 1 deletion .github/workflows/build_maui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@

jobs:
build-prism-maui:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
install-workload: maui maui-tizen
test-projects: |
tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
dotnet-version: 10.0.100

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
6 changes: 4 additions & 2 deletions .github/workflows/build_uno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@

jobs:
build-prism-uno:
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v2
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
windows-sdk-version: 18362
dotnet-version: 10.0.100
install-workload: ios android macos maccatalyst wasm-tools tvos
uno-check: false
uno-check-version: 1.33.1
uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
run-tests: false
test-projects: |
tests/Uno/Prism.Uno.WinUI.Tests/Prism.Uno.WinUI.Tests.csproj
tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/Prism.DryIoc.Uno.WinUI.Tests.csproj

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
Comment thread
dansiegel marked this conversation as resolved.
Dismissed
6 changes: 5 additions & 1 deletion .github/workflows/build_wpf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@

jobs:
build-prism-wpf:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
test-projects: |
tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
dotnet-version: 10.0.100

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
30 changes: 22 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,88 +25,102 @@

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
test-projects: |
tests/Prism.Core.Tests/Prism.Core.Tests.csproj
code-sign: false
artifact-name: Core
dotnet-version: 10.0.100
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-wpf:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
test-projects: |
tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
code-sign: false
artifact-name: Wpf
dotnet-version: 10.0.100
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-uno:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v2
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
windows-sdk-version: 18362
dotnet-version: 10.0.100
install-workload: ios android macos maccatalyst wasm-tools tvos
uno-check: false
uno-check-version: 1.33.1
uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
run-tests: false
test-projects: |
tests/Uno/Prism.Uno.WinUI.Tests/Prism.Uno.WinUI.Tests.csproj
tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/Prism.DryIoc.Uno.WinUI.Tests.csproj
code-sign: false
artifact-name: Uno
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-maui:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
install-workload: maui maui-tizen
test-projects: |
tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
code-sign: false
artifact-name: Maui
dotnet-version: 10.0.100
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-avalonia:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Avalonia
solution-path: PrismLibrary_Avalonia.slnf
test-projects: |
tests/Avalonia/Prism.Avalonia.Tests/Prism.Avalonia.Tests.csproj
tests/Avalonia/Prism.DryIoc.Avalonia.Tests/Prism.DryIoc.Avalonia.Tests.csproj
code-sign: false
artifact-name: Avalonia
dotnet-version: 10.0.100
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

generate-consolidated-artifacts:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
needs: [build-prism-core, build-prism-wpf, build-prism-uno, build-prism-maui, build-prism-avalonia]
runs-on: windows-latest
steps:
Expand Down Expand Up @@ -154,21 +168,21 @@
path: .\artifacts\nuget

deploy-internal:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v2
needs: generate-consolidated-artifacts
if: ${{ github.event_name == 'push' }}
with:
name: Deploy Internal
secrets:
feedUrl: ${{ secrets.IN_HOUSE_NUGET_FEED }}
apiKey: ${{ secrets.IN_HOUSE_API_KEY }}

deploy-commercial-plus:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget.yml@v2
needs: generate-consolidated-artifacts
if: ${{ github.event_name == 'push' }}
with:
name: Deploy Commercial Plus
secrets:
feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
4 changes: 2 additions & 2 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@

jobs:
publish-internal:
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v2
secrets:
feedUrl: ${{ secrets.IN_HOUSE_NUGET_FEED }}
apiKey: ${{ secrets.IN_HOUSE_API_KEY }}

publish-commercial-plus:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/deploy-nuget-from-release.yml@v2
secrets:
feedUrl: ${{ secrets.PRISM_NUGET_FEED }}
apiKey: ${{ secrets.PRISM_NUGET_TOKEN }}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
31 changes: 21 additions & 10 deletions .github/workflows/start-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,117 +5,128 @@

jobs:
build-prism-core:
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Core
solution-path: PrismLibrary_Core.slnf
test-projects: |
tests/Prism.Core.Tests/Prism.Core.Tests.csproj
code-sign: true
artifact-name: Core
build-args: /p:OfficialRelease=true
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-wpf:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Wpf
solution-path: PrismLibrary_Wpf.slnf
test-projects: |
tests/Wpf/Prism.Wpf.Tests/Prism.Wpf.Tests.csproj
tests/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
tests/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
code-sign: true
artifact-name: Wpf
build-args: /p:OfficialRelease=true
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-uno:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/msbuild-build.yml@v2
with:
name: Build Prism.Uno
solution-path: PrismLibrary_Uno.slnf
windows-sdk-version: 18362
dotnet-version: 8.0.300
install-workload: ios android macos maccatalyst wasm-tools
dotnet-version: 10.0.100
install-workload: ios android macos maccatalyst wasm-tools tvos
uno-check: false
uno-check-version: 1.25.1
uno-check-version: 1.33.1
uno-check-parameters: '--skip xcode --skip gtk3 --skip vswin --skip androidemulator --skip androidsdk --skip vsmac --skip dotnetnewunotemplates'
run-tests: false
test-projects: |
tests/Uno/Prism.Uno.WinUI.Tests/Prism.Uno.WinUI.Tests.csproj
tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/Prism.DryIoc.Uno.WinUI.Tests.csproj
code-sign: true
artifact-name: Uno
build-args: /p:OfficialRelease=true
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

build-prism-maui:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/dotnet-build.yml@v2
with:
name: Build Prism.Maui
solution-path: PrismLibrary_Maui.slnf
dotnet-version: 8.0.x
install-workload: maui maui-tizen
test-projects: |
tests/Maui/Prism.Maui.Tests/Prism.Maui.Tests.csproj
tests/Maui/Prism.DryIoc.Maui.Tests/Prism.DryIoc.Maui.Tests.csproj
code-sign: true
artifact-name: Maui
build-args: /p:OfficialRelease=true
secrets:
codeSignKeyVault: ${{ secrets.CodeSignKeyVault }}
codeSignClientId: ${{ secrets.CodeSignClientId }}
codeSignTenantId: ${{ secrets.CodeSignTenantId }}
codeSignClientSecret: ${{ secrets.CodeSignClientSecret }}
codeSignCertificate: ${{ secrets.CodeSignCertificate }}

generate-consolidated-artifacts:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
needs: [build-prism-core, build-prism-wpf, build-prism-uno]
needs: [build-prism-core, build-prism-wpf, build-prism-uno, build-prism-maui]
runs-on: windows-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Download Core
uses: actions/download-artifact@v3
with:
name: Core
path: artifacts\Core

- name: Download Wpf
uses: actions/download-artifact@v3
with:
name: Wpf
path: artifacts\Wpf

- name: Download Uno
uses: actions/download-artifact@v3
with:
name: Uno
path: artifacts\Uno

- name: Download Maui
uses: actions/download-artifact@v3
with:
name: Maui
path: artifacts\Maui

- name: Consolidate Artifacts
run: build\consolidate-artifacts.ps1
shell: powershell

- name: Upload Consolidated NuGets
uses: actions/upload-artifact@v3
with:
name: NuGet
path: .\artifacts\nuget

release:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@v1
uses: avantipoint/workflow-templates/.github/workflows/generate-release.yml@v2
needs: [generate-consolidated-artifacts]
permissions:
contents: write
Expand Down
1 change: 1 addition & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<!-- Tests -->
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
Expand Down
39 changes: 39 additions & 0 deletions PrismLibrary.sln
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Prism.IocContainer.Avalonia
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Avalonia", "Avalonia", "{904D5094-55F9-4581-90AC-D6C1131F8152}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Uno", "Uno", "{8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.Uno.WinUI.Tests", "tests\Uno\Prism.Uno.WinUI.Tests\Prism.Uno.WinUI.Tests.csproj", "{05132055-211C-42D4-B40A-39E4BB066E7B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism.Uno", "Prism.Uno", "{1E1EDCAE-FD32-8442-764F-7F151A12D8D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prism.DryIoc.Uno.WinUI.Tests", "tests\Uno\Prism.DryIoc.Uno.WinUI.Tests\Prism.DryIoc.Uno.WinUI.Tests.csproj", "{158173F6-E776-422C-9127-8994C504867B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Prism.DryIoc.Uno", "Prism.DryIoc.Uno", "{064C69BC-4576-336C-79BF-6771226CD9DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -372,6 +382,30 @@ Global
{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x64.Build.0 = Release|Any CPU
{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x86.ActiveCfg = Release|Any CPU
{887E0794-798D-4127-847E-6F68D5C9B334}.Release|x86.Build.0 = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x64.ActiveCfg = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x64.Build.0 = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x86.ActiveCfg = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Debug|x86.Build.0 = Debug|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|Any CPU.Build.0 = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x64.ActiveCfg = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x64.Build.0 = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x86.ActiveCfg = Release|Any CPU
{05132055-211C-42D4-B40A-39E4BB066E7B}.Release|x86.Build.0 = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|x64.ActiveCfg = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|x64.Build.0 = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|x86.ActiveCfg = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Debug|x86.Build.0 = Debug|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|Any CPU.Build.0 = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|x64.ActiveCfg = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|x64.Build.0 = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|x86.ActiveCfg = Release|Any CPU
{158173F6-E776-422C-9127-8994C504867B}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -409,6 +443,11 @@ Global
{03B9C775-9582-409F-B67F-6B8A0CE0C7AF} = {904D5094-55F9-4581-90AC-D6C1131F8152}
{887E0794-798D-4127-847E-6F68D5C9B334} = {904D5094-55F9-4581-90AC-D6C1131F8152}
{904D5094-55F9-4581-90AC-D6C1131F8152} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
{8B763117-8E13-0D1A-AFE0-5BC3FACCF29C} = {00FFDC13-7397-46F1-897E-A62A7575D28A}
{05132055-211C-42D4-B40A-39E4BB066E7B} = {8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}
{1E1EDCAE-FD32-8442-764F-7F151A12D8D4} = {8F959801-D494-4CAF-9437-90F30472E169}
{158173F6-E776-422C-9127-8994C504867B} = {8B763117-8E13-0D1A-AFE0-5BC3FACCF29C}
{064C69BC-4576-336C-79BF-6771226CD9DC} = {8F959801-D494-4CAF-9437-90F30472E169}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C7433AE2-B1A0-4C1A-887E-5CAA7AAF67A6}
Expand Down
4 changes: 3 additions & 1 deletion PrismLibrary_Uno.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"src\\Uno\\Prism.DryIoc.Uno\\Prism.DryIoc.Uno.WinUI.csproj",
"src\\Uno\\Prism.Uno\\Prism.Uno.WinUI.csproj",
"src\\Uno\\Prism.Uno.Markup\\Prism.Uno.WinUI.Markup.csproj",
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj"
"tests\\Prism.Core.Tests\\Prism.Core.Tests.csproj",
"tests\\Uno\\Prism.DryIoc.Uno.WinUI.Tests\\Prism.DryIoc.Uno.WinUI.Tests.csproj",
"tests\\Uno\\Prism.Uno.WinUI.Tests\\Prism.Uno.WinUI.Tests.csproj"
]
}
}
18 changes: 18 additions & 0 deletions tests/Uno/Prism.DryIoc.Uno.WinUI.Tests/ContainerHelper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
using DryIoc;
using Prism.Container.DryIoc;
using Prism.Ioc;

namespace Prism.Container.Uno.Tests;

public static class ContainerHelper
{
private static Rules CreateContainerRules() => Rules.Default.WithAutoConcreteTypeResolution()
.With(Made.Of(FactoryMethod.ConstructorWithResolvableArguments))
.WithDefaultIfAlreadyRegistered(IfAlreadyRegistered.Replace);

public static IContainer CreateContainer() => new global::DryIoc.Container(CreateContainerRules());

public static IContainerExtension CreateContainerExtension() => new DryIocContainerExtension(CreateContainer());

public static Type RegisteredFrameworkException => typeof(ContainerException);
}
Loading
Loading