Skip to content

Commit b8306b2

Browse files
azchohfiazchohfi
committed
Updated TFM to net5.0.
1 parent 01441bb commit b8306b2

File tree

7 files changed

+26
-964
lines changed

7 files changed

+26
-964
lines changed

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp5.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<Title>Windows Community Toolkit Graph Controls</Title>
66
<PackageId>Microsoft.Toolkit.Graph.Controls</PackageId>
77
<Description>
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200512.7" />
22+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
2323
<!--<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />-->
2424
</ItemGroup>
2525
<ItemGroup>
@@ -35,17 +35,17 @@
3535
</Resource>
3636
</ItemGroup>
3737
<ItemGroup Condition="Exists('$(OutputPath)\$(AssemblyName).pri')">
38-
<None Include="$(SolutionDir)\build\CopyPri.targets" Pack="True" PackagePath="buildTransitive\netcoreapp5.0\$(AssemblyName).targets" />
38+
<None Include="$(SolutionDir)\build\CopyPri.targets" Pack="True" PackagePath="buildTransitive\net5.0\$(AssemblyName).targets" />
3939
<!-- Small fix for wrong TFM in final nuget -->
40-
<None Include="$(OutputPath)\$(AssemblyName).pri;$(OutputPath)\$(AssemblyName).dll;$(OutputPath)\$(AssemblyName).xml;$(OutputPath)\$(AssemblyName).pdb" Pack="True" PackagePath="lib\netcoreapp5.0\"/>
40+
<None Include="$(OutputPath)\$(AssemblyName).pri;$(OutputPath)\$(AssemblyName).dll;$(OutputPath)\$(AssemblyName).xml;$(OutputPath)\$(AssemblyName).pdb" Pack="True" PackagePath="lib\net5.0\"/>
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-preview1" />
45-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-preview1" />
44+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI" Version="8.0.0-build.47.g38f43b5ce8" />
45+
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls" Version="8.0.0-build.47.g38f43b5ce8" />
4646
<ProjectReference Include="..\Microsoft.Toolkit.Graph\Microsoft.Toolkit.Graph.csproj" />
4747
<PackageReference Include="Microsoft.WinUI">
48-
<Version>3.0.0-preview1.200515.3</Version>
48+
<Version>3.0.0-preview1.200629.2-CI</Version>
4949
</PackageReference>
5050
</ItemGroup>
5151

‎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-preview1" />
17+
<PackageReference Include="Microsoft.Toolkit" Version="8.0.0-build.47.g38f43b5ce8" />
1818
</ItemGroup>
1919
</Project>

‎SampleTest.Package/SampleTest.Package.wapproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,9 @@
5959
<SDKReference Include="Microsoft.VCLibs, Version=14.0" Condition="'$(Configuration)' == 'Debug'" />
6060
</ItemGroup>
6161
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
62-
<Import Project="build\Microsoft.WinUI.AppX.targets" />
62+
<PropertyGroup>
63+
<AppxTargetsLocation Condition="'$(AppxTargetsLocation)'==''">$(MSBuildThisFileDirectory)build\</AppxTargetsLocation>
64+
<EntryPointProjectUniqueName>..\SampleTest\SampleTest.csproj</EntryPointProjectUniqueName>
65+
</PropertyGroup>
66+
<Import Project="$(AppxTargetsLocation)Microsoft.WinUI.AppX.targets" />
6367
</Project>

‎SampleTest.Package/build/LiftedWinRTClassRegistrations.xml

+7-943
Large diffs are not rendered by default.

‎SampleTest/SampleTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>netcoreapp5.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
66
<RootNamespace>SampleTest</RootNamespace>
77

@@ -20,10 +20,10 @@
2020

2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.WinUI">
23-
<Version>3.0.0-preview1.200515.1-CI</Version>
23+
<Version>3.0.0-preview1.200629.2-CI</Version>
2424
</PackageReference>
2525
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
26-
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200512.7" />
26+
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="0.1.0-prerelease.200629.3" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<ProjectReference Include="..\Microsoft.Toolkit.Graph.Controls\Microsoft.Toolkit.Graph.Controls.csproj">

‎build/CopyPri.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<ItemGroup Condition="'$(OutputType)' == 'WinExe'">
3-
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\netcoreapp5.0\$(MSBuildThisFileName).pri"/>
3+
<ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\..\lib\net5.0\$(MSBuildThisFileName).pri"/>
44
</ItemGroup>
55
</Project>

‎nuget.config

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
5-
<add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
6-
<add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
7-
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
8-
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
9-
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
10-
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
114
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
125
<add key="MyGetWCT" value="https://dotnet.myget.org/F/uwpcommunitytoolkit/api/v3/index.json" />
13-
<add key="dotnet5@Local" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5%40Local/nuget/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" />
148
</packageSources>
159
</configuration>

0 commit comments

Comments
 (0)