Skip to content

Commit

Permalink
update version to 2.6 (#3932)
Browse files Browse the repository at this point in the history
  • Loading branch information
ranjeshj authored Jan 12, 2021
1 parent 55dbe9f commit d494565
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,34 @@
<Import Project="$(MSBuildThisFileDirectory)\MicrosoftUIXamlVersion.props"/>
<Import Project="$(MSBuildThisFileDirectory)\Common.targets"/>
<ItemGroup>
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x86\Release\Microsoft.UI.Xaml.2.5.appx">
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x86\Release\Microsoft.UI.Xaml.2.6.appx">
<Architecture>x86</Architecture>
<Version>$(MicrosoftUIXamlAppxVersion)</Version>
<Publisher>'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'</Publisher>
</AppxPackageRegistration>
<!-- Some C++/CX projects use Platform=Win32 instead of Platform=x86 -->
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x86\Release\Microsoft.UI.Xaml.2.5.appx">
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x86\Release\Microsoft.UI.Xaml.2.6.appx">
<Architecture>Win32</Architecture>
<Version>$(MicrosoftUIXamlAppxVersion)</Version>
<Publisher>'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'</Publisher>
</AppxPackageRegistration>
</ItemGroup>
<ItemGroup>
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x64\Release\Microsoft.UI.Xaml.2.5.appx">
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\x64\Release\Microsoft.UI.Xaml.2.6.appx">
<Architecture>x64</Architecture>
<Version>$(MicrosoftUIXamlAppxVersion)</Version>
<Publisher>'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'</Publisher>
</AppxPackageRegistration>
</ItemGroup>
<ItemGroup>
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\arm\Release\Microsoft.UI.Xaml.2.5.appx">
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\arm\Release\Microsoft.UI.Xaml.2.6.appx">
<Architecture>arm</Architecture>
<Version>$(MicrosoftUIXamlAppxVersion)</Version>
<Publisher>'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'</Publisher>
</AppxPackageRegistration>
</ItemGroup>
<ItemGroup>
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\arm64\Release\Microsoft.UI.Xaml.2.5.appx">
<AppxPackageRegistration Include="$(MSBuildThisFileDirectory)..\tools\AppX\arm64\Release\Microsoft.UI.Xaml.2.6.appx">
<Architecture>arm64</Architecture>
<Version>$(MicrosoftUIXamlAppxVersion)</Version>
<Publisher>'CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US'</Publisher>
Expand Down
4 changes: 2 additions & 2 deletions dev/inc/BuildMacros.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#ifdef _DEBUG
// NOTE: This could be "Microsoft.UI.Xaml.Debug" if we wanted to have Debug framework packages be distinct and
// installed side-by-side on a machine.
#define MUXCONTROLS_PACKAGE_NAME L"Microsoft.UI.Xaml.2.5"
#define MUXCONTROLS_PACKAGE_NAME L"Microsoft.UI.Xaml.2.6"
#else
#define MUXCONTROLS_PACKAGE_NAME L"Microsoft.UI.Xaml.2.5"
#define MUXCONTROLS_PACKAGE_NAME L"Microsoft.UI.Xaml.2.6"
#endif

#define MUXCONTROLS_CBS_PACKAGE_NAME L"Microsoft.UI.Xaml.CBS"
2 changes: 1 addition & 1 deletion version.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MUXVersionMajor>2</MUXVersionMajor>
<MUXVersionMinor>5</MUXVersionMinor>
<MUXVersionMinor>6</MUXVersionMinor>
<MUXVersionPatch>0</MUXVersionPatch>
<MUXVersionBuild Condition="$(MUXVersionBuild) == ''">0</MUXVersionBuild>
<MUXVersionRevision Condition="$(MUXVersionRevision) == ''">0</MUXVersionRevision>
Expand Down

0 comments on commit d494565

Please sign in to comment.