Skip to content

Commit c891e29

Browse files
committed
Consolidate package versions
Update renamed files in the build logic Use correct path format in the build logic
1 parent a52ad35 commit c891e29

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json">
109109
<Link>stylecop.json</Link>
110110
</AdditionalFiles>
111-
<None Include="$(MSBuildThisFileDirectory)license.md" Pack="true" PackagePath="\" />
111+
<None Include="$(MSBuildThisFileDirectory)License.md" Pack="true" PackagePath="\" />
112112
<None Include="$(MSBuildThisFileDirectory)build\nuget.png" Pack="true" PackagePath="images\" />
113113
</ItemGroup>
114114

Microsoft.Toolkit.Uwp.UI.Controls/Microsoft.Toolkit.Uwp.UI.Controls.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<None Include="$(MSBuildThisFileDirectory)readme.txt" Pack="true" PackagePath="\"/>
15+
<None Include="$(MSBuildThisFileDirectory)ReadMe.txt" Pack="true" PackagePath="\" />
1616
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
1717
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
1818
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Media\Microsoft.Toolkit.Uwp.UI.Controls.Media.csproj" />

SmokeTests/SmokeTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<!-- Only the Layout package have a dependency on WinUI -->
112112
<ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI' or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
113113
<PackageReference Include="Microsoft.UI.Xaml">
114-
<Version>2.4.3</Version>
114+
<Version>2.5.0</Version>
115115
</PackageReference>
116116
</ItemGroup>
117117
<ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
@@ -123,7 +123,7 @@
123123
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
124124
<Target Name="BeforeBuild">
125125
<ItemGroup Condition="$(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'">
126-
<ToolkitNuGets Include="../bin/nupkg/$(CurrentProject).*.nupkg" />
126+
<ToolkitNuGets Include="$(MSBuildThisFileDirectory)..\bin\nupkg\$(CurrentProject).*.nupkg" />
127127
<ToolkitNuGet Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(Identity)', `$(CurrentProject).([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?.nupkg`))" Include="@(ToolkitNuGets)" />
128128
</ItemGroup>
129129
<Error Condition="'@(ToolkitNuGet)' == '' and $(CurrentProject) != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI'" Text="NuGet '$(CurrentProject).[SEMVER].nupkg' doesn't exist!" />

SmokeTests/SmokeTests.proj

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

8383
<Target Name="CheckNuGets">
8484
<PropertyGroup>
85-
<ToolkitNuGets>../bin/nupkg/*.nupkg</ToolkitNuGets>
85+
<ToolkitNuGets>$(MSBuildThisFileDirectory)..\bin\nupkg\*.nupkg</ToolkitNuGets>
8686
</PropertyGroup>
8787
<ItemGroup>
8888
<ToolkitNuGets Include="$(ToolkitNuGets)" />

UnitTests/UnitTests.NetCore/UnitTests.NetCore.csproj

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

99
<ItemGroup>
1010
<PackageReference Include="FluentAssertions" Version="5.10.3" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
1212
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
1313
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1414
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.5" />

0 commit comments

Comments
 (0)