Skip to content

Commit 758154c

Browse files
authored
Merge pull request #161 from unoplatform/dev/jela/winui-migration
migration
2 parents 9b18df8 + f9487fa commit 758154c

File tree

2,653 files changed

+63108
-38829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,653 files changed

+63108
-38829
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ msbuild.binlog
229229
# Generated file from .ttinclude
230230
**/Generated/TypeInfo.g.cs
231231

232+
# Files generated by the VS build
233+
**/Generated Files/**
234+
232235
# TAEF Log output
233236
WexLogFileOutput
234237
*.wtl
238+
*.wtl.trace

.vsts-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ jobs:
5656
- task: UseDotNet@2
5757
inputs:
5858
packageType: 'sdk'
59-
version: '5.0.103'
60-
displayName: Use .NET SDK 5.0.103
59+
version: '5.0.402'
60+
displayName: Use .NET SDK 5.0.402
6161

6262
- task: DotNetCoreCLI@2
6363
inputs:
@@ -122,17 +122,17 @@ jobs:
122122
- task: UseDotNet@2
123123
inputs:
124124
packageType: 'sdk'
125-
version: '5.0.103'
126-
displayName: Use .NET SDK 5.0.103
125+
version: '5.0.402'
126+
displayName: Use .NET SDK 5.0.402
127127

128128
- bash: |
129-
cd $(build.sourcesdirectory)/Microsoft.Toolkit.Uwp.SampleApp.Wasm
130-
dotnet msbuild /r /nr:false /m:1 /p:Configuration=Release /p:UnoUIUseRoslynSourceGenerators=false /p:UnoUIVersionOverride=true $(build.sourcesdirectory)/Microsoft.Toolkit.Uwp.SampleApp.Wasm/Microsoft.Toolkit.Uwp.SampleApp.Wasm.csproj /p:TargetFrameworksOverride=netstandard2.0 /bl:$(build.artifactstagingdirectory)/build.binlog
129+
cd $(build.sourcesdirectory)/CommunityToolkit.WinUI.SampleApp.Wasm
130+
dotnet msbuild /r /nr:false /m:1 /p:Configuration=Release /p:UnoUIUseRoslynSourceGenerators=false /p:UnoUIVersionOverride=true $(build.sourcesdirectory)/CommunityToolkit.WinUI.SampleApp.Wasm/CommunityToolkit.WinUI.SampleApp.Wasm.csproj /p:TargetFrameworksOverride=netstandard2.0 /bl:$(build.artifactstagingdirectory)/build.binlog
131131
132132
- task: CopyFiles@2
133133
displayName: 'Publish Wasm Binaries'
134134
inputs:
135-
SourceFolder: $(build.sourcesdirectory)/Microsoft.Toolkit.Uwp.SampleApp.Wasm/bin/Release/net5.0/dist
135+
SourceFolder: $(build.sourcesdirectory)/CommunityToolkit.WinUI.SampleApp.Wasm/bin/Release/net5.0/dist
136136
Contents: '**/*.*'
137137
TargetFolder: $(build.artifactstagingdirectory)
138138
CleanTargetFolder: false

Microsoft.Toolkit/Collections/IReadOnlyObservableGroup.cs renamed to CommunityToolkit.Common/Collections/IReadOnlyObservableGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System.ComponentModel;
66

7-
namespace Microsoft.Toolkit.Collections
7+
namespace CommunityToolkit.Common.Collections
88
{
99
/// <summary>
1010
/// An interface for a grouped collection of items.

Microsoft.Toolkit/Collections/ObservableGroup.cs renamed to CommunityToolkit.Common/Collections/ObservableGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Diagnostics;
99
using System.Linq;
1010

11-
namespace Microsoft.Toolkit.Collections
11+
namespace CommunityToolkit.Common.Collections
1212
{
1313
/// <summary>
1414
/// An observable group.

Microsoft.Toolkit/Collections/ObservableGroupedCollection.cs renamed to CommunityToolkit.Common/Collections/ObservableGroupedCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Linq;
99
using System.Runtime.CompilerServices;
1010

11-
namespace Microsoft.Toolkit.Collections
11+
namespace CommunityToolkit.Common.Collections
1212
{
1313
/// <summary>
1414
/// An observable list of observable groups.

Microsoft.Toolkit/Collections/ObservableGroupedCollectionExtensions.cs renamed to CommunityToolkit.Common/Collections/ObservableGroupedCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Linq;
99
using System.Runtime.CompilerServices;
1010

11-
namespace Microsoft.Toolkit.Collections
11+
namespace CommunityToolkit.Common.Collections
1212
{
1313
/// <summary>
1414
/// The extensions methods to simplify the usage of <see cref="ObservableGroupedCollection{TKey, TValue}"/>.

Microsoft.Toolkit/Collections/ReadOnlyObservableGroup.cs renamed to CommunityToolkit.Common/Collections/ReadOnlyObservableGroup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Collections.ObjectModel;
77
using System.Linq;
88

9-
namespace Microsoft.Toolkit.Collections
9+
namespace CommunityToolkit.Common.Collections
1010
{
1111
/// <summary>
1212
/// A read-only observable group. It associates a <see cref="Key"/> to a <see cref="ReadOnlyObservableCollection{T}"/>.

0 commit comments

Comments
 (0)