Skip to content

Commit

Permalink
Move Versioning to GitHub
Browse files Browse the repository at this point in the history
  • Loading branch information
lewischeng-ms committed Apr 8, 2015
1 parent 48bd697 commit a61222f
Show file tree
Hide file tree
Showing 30 changed files with 148 additions and 139 deletions.
21 changes: 0 additions & 21 deletions src/AssemblyInfo/AssemblyInfoCommon.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,3 @@
[assembly:NeutralResourcesLanguageAttribute("en-US")]

#endif

#if SERVICEABLE
[assembly: AssemblyMetadata("Serviceable", "True")]
#if NET40 || NET35
namespace System.Reflection
{
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
internal sealed class AssemblyMetadataAttribute : Attribute
{
public AssemblyMetadataAttribute(string key, string value)
{
Key = key;
Value = value;
}

public string Key { get; set; }
public string Value { get; set; }
}
}
#endif
#endif
21 changes: 21 additions & 0 deletions src/AssemblyInfo/AssemblyMetadataAttribute.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//---------------------------------------------------------------------
// <copyright file="AssemblyMetadataAttribute.cs" company="Microsoft">
// Copyright (C) Microsoft Corporation. All rights reserved. See License.txt in the project root for license information.
// </copyright>
//---------------------------------------------------------------------

namespace System.Reflection
{
[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true, Inherited = false)]
internal sealed class AssemblyMetadataAttribute : Attribute
{
public AssemblyMetadataAttribute(string key, string value)
{
Key = key;
Value = value;
}

public string Key { get; set; }
public string Value { get; set; }
}
}
4 changes: 2 additions & 2 deletions src/AssemblyInfo/AssemblyRefs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ internal static class Name
internal static class File
{
/// <summary>base version for data framework</summary>
internal const string DS_BaseVersion = "Ver0";
internal const string DS_BaseVersion = VersionConstants.ReleaseVersion;

/// <summary>where to find desktop reference client sku reference assemblies</summary>
internal const string DotNetFrameworkV4_ClientReferenceAssemblyPath = @"%ProgramFiles%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\Profile\Client";
Expand Down Expand Up @@ -153,7 +153,7 @@ private static string GetDS_Tools_InstallPath()
internal const string SpatialCore = "Microsoft.Spatial.dll";
}

internal const string DataFxAssemblyVersion = "0.0.0.0";
internal const string DataFxAssemblyVersion = VersionConstants.AssemblyVersion;
internal const string FXAssemblyVersion = "4.0.0.0";

internal const string EcmaPublicKey = "b77a5c561934e089";
Expand Down
4 changes: 2 additions & 2 deletions src/AssemblyInfo/AssemblyRefs.vb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Friend Class DataFxAssemblyRef
Friend Shared SilverlightV5_ReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft Silverlight\5.1.20913.0"
Friend Shared SilverlightV5_SdkClientReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft SDKs\Silverlight\v5.0\Libraries\Client"
Friend Shared SilverlightV5_SdkServerReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft SDKs\Silverlight\v5.0\Libraries\Server"
Friend Shared DS_BaseVersion As String = "Ver0"
Friend Shared DS_BaseVersion As String = VersionConstants.ReleaseVersion
Friend Shared EF_ReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft Entity Framework June 2011 CTP\bin\.NetFramework"
Friend Shared DS_ReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft WCF Data Services\" + DS_BaseVersion + "\bin\.NetFramework"
Friend Shared DS_SilverlightReferenceAssemblyPath As String = "%ProgramFiles%\Microsoft WCF Data Services\" + DS_BaseVersion + "\bin\Silverlight"
Expand All @@ -58,7 +58,7 @@ Friend Class DataFxAssemblyRef

End Class

Friend Shared DataFxAssemblyVersion As String = "0.0.0.0"
Friend Shared DataFxAssemblyVersion As String = VersionConstants.AssemblyVersion
Friend Shared FXAssemblyVersion As String = "4.0.0.0"

Friend Shared EcmaPublicKey As String = "b77a5c561934e089"
Expand Down
24 changes: 0 additions & 24 deletions src/AssemblyInfo/AssemblyVersion.cs

This file was deleted.

23 changes: 0 additions & 23 deletions src/AssemblyInfo/AssemblyVersion.vb

This file was deleted.

12 changes: 1 addition & 11 deletions src/Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,7 @@

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\tools\CustomMSBuild\TargetFrameworkPath.props" Condition="'$(BuildInOSS)' == 'true'"/>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\_BuildCommon\Extensions\TargetFrameworkPath.props" Condition="'$(BuildInOSS)' != 'true'"/>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'Silverlight' and '$(TargetFrameworkProfile)' == 'WindowsPhone71'">
<GenerateTargetFrameworkAttribute Condition="'$(GenerateTargetFrameworkAttribute)' == ''">true</GenerateTargetFrameworkAttribute>
<ShouldGenerateAssemblyAttributeFile Condition="'$(ShouldGenerateAssemblyAttributeFile)' == ''">false</ShouldGenerateAssemblyAttributeFile>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>$(DefineConstants);SERVICEABLE</DefineConstants>
<DefineConstants Condition="'$(TargetFrameworkVersion)' == 'v3.5'">$(DefineConstants);NET35</DefineConstants>
<DefineConstants Condition="'$(TargetFrameworkVersion)' == 'v4.0'">$(DefineConstants);NET40</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<RelativeOutputPath>Product\$(RelativeOutputPath)</RelativeOutputPath>
<EnableStyleCop>true</EnableStyleCop>
Expand All @@ -44,6 +33,7 @@
</ItemGroup>

<Import Project="..\Build.props" />
<Import Project="$(CustomBuildExtensionsPath)\Versioning.props" />

<!-- This PropertyGroup should always be after the import of Build.props because it's extending the value of NugetPackOptions which is defined in Nuget.props which is included using Build.props -->
<PropertyGroup>
Expand Down
15 changes: 0 additions & 15 deletions src/CodeGen/Build.props

This file was deleted.

6 changes: 2 additions & 4 deletions src/CodeGen/Microsoft.Data.Web.Design.T4.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<ProjectGuid>{E4167281-C1AF-48C1-9BBD-0453BFB8CE2D}</ProjectGuid>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<EnableStyleCop>false</EnableStyleCop>
<ShouldGenerateVersionConstantsFile>true</ShouldGenerateVersionConstantsFile>
</PropertyGroup>
<Import Project="..\Build.props" />
<ItemGroup>
Expand All @@ -31,10 +32,7 @@
</ItemGroup>
<!-- Source files -->
<ItemGroup>
<Compile Include="$(EnlistmentRoot)\_BuildCommon\ProductVersion\AssemblyRefs.cs" Condition="'$(BuildInOSS)' != 'true'">
<Link>AssemblyRefs.cs</Link>
</Compile>
<Compile Include="$(EnlistmentRoot)\src\AssemblyInfo\AssemblyRefs.cs" Condition="'$(BuildInOSS)' == 'true'">
<Compile Include="$(EnlistmentRoot)\src\AssemblyInfo\AssemblyRefs.cs">
<Link>AssemblyRefs.cs</Link>
</Compile>
<Compile Include="ODataT4CodeGenerator.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\SystemToken.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" target="src\Microsoft.OData.Core\UriParser\SyntacticAst\UnaryOperatorToken.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueParser.cs" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" target="src\Microsoft.OData.Edm\Csdl\EdmValueWriter.cs" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src=".NETPortable\v4.0\Microsoft.OData.Edm\1041\Microsoft.OData.Edm.resources.dll" target="lib\portable-net40+sl5+wp8+win8+wpa\ja" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="Net35\Microsoft.OData.Edm.NetFX35.xml" target="lib\net35" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src=".NETPortable\v4.0\Microsoft.OData.Edm\1049\Microsoft.OData.Edm.resources.dll" target="lib\portable-net40+sl5+wp8+win8+wpa\ru" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm\" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src=".NETPortable\v4.0\Microsoft.OData.Edm\1049\Microsoft.OData.Edm.resources.dll" target="lib\portable-net40+sl5+wp8+win8+wpa\ru" />
<file src="$SourcesRoot$\src\Microsoft.OData.Edm\**\*.cs" target="src\Microsoft.OData.Edm" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@
<!-- Source files that are specific to this project -->
<ItemGroup>
<None Include="$(IntermediateOutputDirectory)\AssemblyAttributes.cs" />
<None Include="$(IntermediateOutputDirectory)\Microsoft.Spatial.cs" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Microsoft.Spatial.cs">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src=".NETPortable\v4.0\Microsoft.Spatial\1041\Microsoft.Spatial.resources.dll" target="lib\portable-net40+sl5+wp8+win8+wpa\ja" />
<file src="$SourcesRoot$\src\Microsoft.Spatial\**\*.cs" target="src\Microsoft.Spatial" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src="Net35\Microsoft.Spatial.NetFX35.xml" target="lib\net35" />
<file src="$SourcesRoot$\src\Microsoft.Spatial\**\*.cs" target="src\Microsoft.Spatial" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@ OData .NET library is open source at http://github.com/OData/odata.net</descript
<file src=".NETPortable\v4.0\Microsoft.Spatial\1049\Microsoft.Spatial.resources.dll" target="lib\portable-net40+sl5+wp8+win8+wpa\ru" />
<file src="$SourcesRoot$\src\Microsoft.Spatial\**\*.cs" target="src\Microsoft.Spatial" />
<file src="$SourcesRoot$\src\PlatformHelper.cs" target="src\PlatformHelper.cs" />
<file src="$SourcesRoot$\_BuildCommon\ProductVersion\AssemblyInfoCommon.cs" target="src\AssemblyInfoCommon.cs" />
<file src="$SourcesRoot$\src\AssemblyInfo\AssemblyMetadataAttribute.cs" target="src\AssemblyMetadataAttribute.cs" />
</files>
</package>
Loading

0 comments on commit a61222f

Please sign in to comment.