Merge pull request #37 from Microsoft/dev/drewgil/versioning

Collecting all assembly and package version files together in a Versi…
This commit is contained in:
Lingling Tong 2015-11-18 17:04:34 -08:00
Родитель 3ade1bd2bd 6cb25f827e
Коммит 2ba0128d82
28 изменённых файлов: 94 добавлений и 89 удалений

Просмотреть файл

@ -70,4 +70,9 @@ Examples:
nuget push Microsoft.Xaml.Behaviors.Uwp.Managed.1.0.0.nupkg // upload the package, and Microsoft.Xaml.Behaviors.Uwp.Managed.1.0.0.symbols.nupkg if present
nuget push Microsoft.Xaml.Behaviors.Uwp.Managed.1.0.0.symbols.nupkg // upload just the symbols for Microsoft.Xaml.Behaviors.Uwp.Managed.1.0.0.nupkg
In VS, setting http://srv.symbolsource.org/pdb/Public as a symbol file location will enable lookups to this package. You will have symbols and source in your behavior debugging sessions. Full details at http://docs.nuget.org/Create/Creating-and-Publishing-a-Symbol-Package and http://www.symbolsource.org/Public/Home/VisualStudio.
In VS, setting http://srv.symbolsource.org/pdb/Public as a symbol file location will enable lookups to this package. You will have symbols and source in your behavior debugging sessions. Full details at http://docs.nuget.org/Create/Creating-and-Publishing-a-Symbol-Package and http://www.symbolsource.org/Public/Home/VisualStudio.
Versioning
----------
Version files are all collected together into the source trees for the two SDKs, in src\<SDK>\Version. When revising a version for either SDK, be sure to change it in all files represented here before rebuilding and re-packaging. Keeping the NuGet package version in sync with the assemblies in that package will help avoid confusion.

Просмотреть файл

@ -17,7 +17,7 @@ IF EXIST ..\out\BehaviorsSDKManaged\bin\AnyCPU\Release\Microsoft.Xaml.Interactio
GOTO PACK
:PackWithFileVersion
SET /p VERSION=<VERSION
SET /p VERSION=<..\src\BehaviorsSDKManaged\Version\NuGetPackageVersion.txt
GOTO PACK
)
@ -29,9 +29,10 @@ GOTO END
SET NUGET_ARGS=^
-nopackageanalysis ^
-version %VERSION% ^
-Verbosity detailed
-Verbosity detailed ^
-Symbols
nuget pack Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec -Symbols %NUGET_ARGS%
nuget pack Microsoft.Xaml.Behaviors.Uwp.Managed.nuspec %NUGET_ARGS%
:END

Просмотреть файл

@ -16,7 +16,7 @@ SET VERSION=%1
GOTO PACK
:PackWithFileVersion
SET /p VERSION=<VERSION
SET /p VERSION=<..\src\BehaviorsSDKNative\Version\NuGetPackageVersion.txt
GOTO PACK
@ -24,9 +24,10 @@ GOTO PACK
SET NUGET_ARGS=^
-nopackageanalysis ^
-version %VERSION% ^
-Verbosity detailed
-Verbosity detailed ^
-Symbols
nuget pack Microsoft.Xaml.Behaviors.Uwp.Native.nuspec -Symbols %NUGET_ARGS%
nuget pack Microsoft.Xaml.Behaviors.Uwp.Native.nuspec %NUGET_ARGS%
:END

Просмотреть файл

@ -2,7 +2,7 @@
<package >
<metadata>
<id>Microsoft.Xaml.Behaviors.Uwp.Managed</id>
<version>1.0.0</version>
<version>0.0.0</version><!--Overridden using -Version switch in nuget pack command-->
<title>Microsoft.Xaml.Behaviors.Uwp.Managed</title>
<authors>Microsoft</authors>
<owners>xamlexperiencesteam,Microsoft</owners>

Просмотреть файл

@ -2,7 +2,7 @@
<package >
<metadata>
<id>Microsoft.Xaml.Behaviors.Uwp.Native</id>
<version>1.0.0</version>
<version>0.0.0</version><!--Overridden using -Version switch in nuget pack command-->
<title>Microsoft.Xaml.Behaviors.Uwp.Native</title>
<authors>Microsoft</authors>
<owners>xamlexperiencesteam,Microsoft</owners>

Просмотреть файл

@ -105,6 +105,9 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="..\Version\Version.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

Просмотреть файл

@ -43,18 +43,5 @@ using Microsoft.Xaml.Interactivity.Design;
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// Entry point for metadata provider
[assembly: ProvideMetadata(typeof(MetadataTableProvider))]

Просмотреть файл

@ -144,6 +144,7 @@
<Compile Include="Media\ControlStoryboardOption.cs" />
<Compile Include="Media\PlaySoundAction.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Version\Version.cs" />
<Content Include="Properties\Microsoft.Xaml.Interactions.rd.xml" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -17,16 +17,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: ComVisible(false)]

Просмотреть файл

@ -105,6 +105,9 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="..\Version\Version.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

Просмотреть файл

@ -43,18 +43,5 @@ using Microsoft.Xaml.Interactivity.Design;
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// Entry point for metadata provider
[assembly: ProvideMetadata(typeof(MetadataTableProvider))]

Просмотреть файл

@ -140,6 +140,7 @@
<Compile Include="IBehavior.cs" />
<Compile Include="Interaction.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\Version\Version.cs" />
<Compile Include="ResourceHelper.cs" />
<Compile Include="TypeConstraintAttribute.cs" />
<Compile Include="VisualStateUtilities.cs" />

Просмотреть файл

@ -16,16 +16,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: ComVisible(false)]

Просмотреть файл

@ -0,0 +1,17 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Reflection;
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

Просмотреть файл

@ -106,6 +106,9 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="..\Version\Design.Version.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

Просмотреть файл

@ -1,6 +1,4 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
using Microsoft.Windows.Design.Metadata;
@ -43,18 +41,5 @@ using Microsoft.Xaml.Interactivity.Design;
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// Entry point for metadata provider
[assembly: ProvideMetadata(typeof(MetadataTableProvider))]

Просмотреть файл

@ -271,6 +271,9 @@
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactions.zh-CN.xlf" />
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactions.zh-TW.xlf" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Version\Microsoft.Xaml.Interactions.Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" />
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">

Просмотреть файл

@ -63,4 +63,9 @@
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactions.zh-CN.xlf" />
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactions.zh-TW.xlf" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Version\Microsoft.Xaml.Interactions.Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

Просмотреть файл

@ -106,6 +106,9 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="..\Version\Design.Version.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>

Просмотреть файл

@ -1,6 +1,4 @@
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Windows;
using Microsoft.Windows.Design.Metadata;
@ -43,18 +41,5 @@ using Microsoft.Xaml.Interactivity.Design;
)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
// Entry point for metadata provider
[assembly: ProvideMetadata(typeof(MetadataTableProvider))]

Просмотреть файл

@ -221,6 +221,7 @@
<ClInclude Include="Interaction.h" />
<ClInclude Include="Microsoft.Xaml.Interactivity.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="ResourceHelper.h" />
<ClInclude Include="targetver.h" />
<ClInclude Include="VisualStateUtilities.h" />
@ -260,6 +261,9 @@
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactivity.zh-CN.xlf" />
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactivity.zh-TW.xlf" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\Version\Microsoft.Xaml.Interactivity.Version.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets" Label="MultilingualAppToolkit" Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" />
<Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.PriResources.targets')" Label="MultilingualAppToolkit">

Просмотреть файл

@ -28,6 +28,7 @@
<ClInclude Include="ResourceHelper.h" />
<ClInclude Include="VisualStateUtilities.h" />
<ClInclude Include="Microsoft.Xaml.Interactivity.h" />
<ClInclude Include="resource.h" />
</ItemGroup>
<ItemGroup>
<PRIResource Include="Resources\de-DE\Strings.resw" />
@ -54,4 +55,9 @@
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactivity.zh-CN.xlf" />
<XliffResource Include="MultilingualResources\Microsoft.Xaml.Interactivity.zh-TW.xlf" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Microsoft.Xaml.Interactivity.Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

Просмотреть файл

@ -0,0 +1,14 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by Microsoft.Xaml.Interactivity.Version.rc
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1001
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif

Просмотреть файл

@ -0,0 +1,14 @@
using System.Reflection;
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

Двоичный файл не отображается.

Двоичный файл не отображается.

Просмотреть файл

@ -0,0 +1 @@
1.0.0