Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Prism version to 8.2 preview #2502

Merged
merged 4 commits into from
Jul 1, 2021
Merged

Bump Prism version to 8.2 preview #2502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81ec5e0
bump to version 8.2
dansiegel Jul 1, 2021
879f3f3
update dependencies
dansiegel Jul 1, 2021
def498d
disable the e2e stage
dansiegel Jul 1, 2021
3ddf3ab
bump MSBuild SDK
dansiegel Jul 1, 2021
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
36 changes: 18 additions & 18 deletions Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<ItemGroup>
<PackageReference Update="DryIoc.dll" Version="4.7.7" />
<PackageReference Update="DryIoc.dll" Version="4.8.0" />
<PackageReference Update="Unity.Container" Version="5.11.11" />

<PackageReference Update="System.ValueTuple" Version="4.5.0" />
Expand All @@ -11,42 +11,42 @@

<!-- Uno -->
<ItemGroup>
<PackageReference Update="Uno.UI" Version="3.7.4" />
<PackageReference Update="Uno.WinUI" Version="3.7.4" />
<PackageReference Update="Uno.Core" Version="2.3.0" />
<PackageReference Update="Uno.UI" Version="3.8.11" />
<PackageReference Update="Uno.WinUI" Version="3.8.11" />
<PackageReference Update="Uno.Core" Version="2.4.0" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.3-uno.92" />
<PackageReference Update="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.3-uno.92" />
<PackageReference Update="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.0.1" />
<PackageReference Update="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.3" />
<PackageReference Update="Uno.UI.RemoteControl" Version="3.7.4" />
<PackageReference Update="Uno.WinUI.RemoteControl" Version="3.7.4" />
<PackageReference Update="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.4" />
<PackageReference Update="Uno.UI.RemoteControl" Version="3.8.11" />
<PackageReference Update="Uno.WinUI.RemoteControl" Version="3.8.11" />
<PackageReference Update="Uno.UniversalImageLoader" Version="1.9.33" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Update="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
<PackageReference Update="Uno.Extensions.Logging.OSLog " Version="1.0.1" />
<PackageReference Update="Uno.Extensions.Logging.WebAssembly.Console" Version="1.1.0" />
<PackageReference Update="Uno.Extensions.Logging.OSLog " Version="1.1.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
<PackageReference Update="Uno.UI.WebAssembly" Version="3.7.4" />
<PackageReference Update="Uno.WinUI.Skia.Gtk" Version="3.7.4" />
<PackageReference Update="Uno.WinUI.Skia.Wpf" Version="3.7.4" />
<PackageReference Update="Uno.WinUI.WebAssembly" Version="3.7.4" />
<PackageReference Update="Uno.UI.WebAssembly" Version="3.8.11" />
<PackageReference Update="Uno.WinUI.Skia.Gtk" Version="3.8.11" />
<PackageReference Update="Uno.WinUI.Skia.Wpf" Version="3.8.11" />
<PackageReference Update="Uno.WinUI.WebAssembly" Version="3.8.11" />
<PackageReference Update="Uno.Wasm.Bootstrap" Version="2.1.0" />
<PackageReference Update="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
<PackageReference Update="Microsoft.Windows.Compatibility" Version="5.0.2" />
<PackageReference Update="Microsoft.ProjectReunion" Version="0.5.7" />
<PackageReference Update="Microsoft.ProjectReunion" Version="0.8.0" />
<PackageReference Update="Microsoft.ProjectReunion.Foundation" Version="0.5.0" />
<PackageReference Update="Microsoft.ProjectReunion.WinUI" Version="0.5.7" />
<PackageReference Update="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />

<PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11" />
</ItemGroup>

<!-- Tests -->
<ItemGroup>
<PackageReference Update="Xamarin.Forms.Mocks" Version="4.7.0.1" />
<PackageReference Update="Humanizer.Core" Version="2.10.1" />
<PackageReference Update="Humanizer.Core" Version="2.11.10" />
<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />

<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Update="Moq" Version="4.16.1" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
Expand Down Expand Up @@ -76,7 +76,7 @@
</ItemGroup>

<ItemGroup Condition=" $(DISABLE_GITVERSIONING) != 'true' ">
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.4.194"
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.4.220"
Condition=" !$(MSBuildProjectDirectory.Contains('e2e')) "/>
</ItemGroup>

Expand Down
68 changes: 34 additions & 34 deletions build/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,40 +58,40 @@ stages:

- template: jobs/prism-uno.yml

- stage: e2e
displayName: End to End
jobs:
- template: jobs/e2e-wpf.yml

- template: jobs/e2e-uno.yml

# - template: jobs/e2e-android.yml
# parameters:
# versionName: '8.0.$(Build.BuildId)'

# - template: jobs/e2e-ios.yml
# parameters:
# versionName: '8.0.$(Build.BuildId)'

- template: jobs/uno-uitest.yml

# Need to refactor this to run locally like Uno UI tests
# - template: jobs/e2e-uitest.yml
# parameters:
# artifactName: E2E-Android
# e2eJobName: e2eAndroid
# appFile: 'com.prismlibrary.helloworld.apk'
# appName: $(AppCenterDroidAppName)
# devices: $(AppCenterDroidDevices)

# - template: jobs/e2e-uitest.yml
# parameters:
# artifactName: E2E-iOS
# e2eJobName: e2eiOS
# appFile: 'HelloWorld.iOS.ipa'
# dsymDirectory: 'HelloWorld.iOS.app.dSYM'
# appName: $(AppCenteriOSAppName)
# devices: $(AppCenteriOSDevices)
# - stage: e2e
# displayName: End to End
# jobs:
# - template: jobs/e2e-wpf.yml

# - template: jobs/e2e-uno.yml

# - template: jobs/e2e-android.yml
# parameters:
# versionName: '8.0.$(Build.BuildId)'

# - template: jobs/e2e-ios.yml
# parameters:
# versionName: '8.0.$(Build.BuildId)'

# - template: jobs/uno-uitest.yml

# Need to refactor this to run locally like Uno UI tests
# - template: jobs/e2e-uitest.yml
# parameters:
# artifactName: E2E-Android
# e2eJobName: e2eAndroid
# appFile: 'com.prismlibrary.helloworld.apk'
# appName: $(AppCenterDroidAppName)
# devices: $(AppCenterDroidDevices)

# - template: jobs/e2e-uitest.yml
# parameters:
# artifactName: E2E-iOS
# e2eJobName: e2eiOS
# appFile: 'HelloWorld.iOS.ipa'
# dsymDirectory: 'HelloWorld.iOS.app.dSYM'
# appName: $(AppCenteriOSAppName)
# devices: $(AppCenteriOSDevices)

- stage: buildPackage
displayName: Build Prism Library
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.203",
"version": "5.0.301",
"rollForward": "latestMinor",
"allowPrerelease": false
},
Expand Down
2 changes: 1 addition & 1 deletion version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "8.1",
"version": "8.2-pre",
"assemblyVersion": {
"precision": "revision"
},
Expand Down