Skip to content

Commit 0561033

Browse files
committed
Updated to WinUI3-preview2.
1 parent 066702e commit 0561033

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Directory.Build.props

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
<NoWarn>CS8002;CS8305</NoWarn> <!-- Temporary since WinUI3 is not stable yet -->
2424
</PropertyGroup>
2525

26+
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
27+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
28+
</PropertyGroup>
29+
2630
<PropertyGroup>
2731
<SignAssembly Condition="'$(SignAssembly)' == ''" >true</SignAssembly>
2832
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>

Microsoft.Toolkit.Graph.Controls/Microsoft.Toolkit.Graph.Controls.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.52.g07f4dd1bd0" />
25-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.52.g07f4dd1bd0" />
24+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.54.g3b4791cdfb" />
25+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.54.g3b4791cdfb" />
2626
<ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
2727
<PackageReference Include="Microsoft.WinUI">
28-
<Version>3.0.0-preview2.200707.3-CI</Version>
28+
<Version>3.0.0-preview2.200713.0</Version>
2929
</PackageReference>
3030
</ItemGroup>
3131

Microsoft.Toolkit.Graph/Microsoft.Toolkit.Graph.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Graph.Beta" Version="0.18.0-preview" />
1616
<PackageReference Include="Microsoft.Graph.Auth" Version="1.0.0-preview.4" />
17-
<PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.52.g07f4dd1bd0" />
17+
<PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.54.g3b4791cdfb" />
1818
</ItemGroup>
1919
</Project>

SampleTest/SampleTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.WinUI">
23-
<Version>3.0.0-preview2.200707.3-CI</Version>
23+
<Version>3.0.0-preview2.200713.0</Version>
2424
</PackageReference>
2525
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
2626
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />

build/build.cake

+1-3
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,7 @@ Task("Build")
180180
MaxCpuCount = 0
181181
}
182182
.SetConfiguration("CI")
183-
.WithTarget("Build")
184-
.WithProperty("GenerateLibraryLayout", "true");
183+
.WithTarget("Build");
185184

186185
UpdateToolsPath(buildSettings);
187186

@@ -228,7 +227,6 @@ Task("Package")
228227
}
229228
.SetConfiguration("CI")
230229
.WithTarget("Pack")
231-
.WithProperty("GenerateLibraryLayout", "true")
232230
.WithProperty("PackageOutputPath", nupkgDir);
233231

234232
UpdateToolsPath(buildSettings);

nuget.config

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
<packageSources>
44
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
55
<add key="MyGetWCT" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" />
6-
<add key="WinUI.Dependencies@Local" value="https://microsoft.pkgs.visualstudio.com/_packaging/WinUI.Dependencies%40Local/nuget/v3/index.json" />
7-
<add key="CsWinRT" value="https://microsoft.pkgs.visualstudio.com/_packaging/CsWinRT/nuget/v3/index.json" />
86
</packageSources>
97
</configuration>

0 commit comments

Comments
 (0)