Add the signing and update to Corelib version beta008

This commit is contained in:
Sam Xu 2017-12-12 11:50:45 -08:00
parent f2874be950
commit fd7508f2e0
9 changed files with 11 additions and 11 deletions

Binary file not shown.

View file

@ -36,8 +36,6 @@ namespace Microsoft.OpenApi.OData.Generator
// }
return new OpenApiDocument
{
SpecVersion = new Version(3, 0, 0),
Info = context.CreateInfo(),
Servers = context.CreateServers(),

View file

@ -11,11 +11,13 @@
<Authors>Microsoft.OpenApi.OData.Reader</Authors>
<LangVersion Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">latest</LangVersion>
<LangVersion Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">latest</LangVersion>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.OData.Reader.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.OData.Edm" Version="7.3.1" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta007" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta008" />
</ItemGroup>
<ItemGroup>

View file

@ -6,4 +6,5 @@
using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.OpenApi.OData.Reader.Tests")]
[assembly: InternalsVisibleTo("Microsoft.OpenApi.OData.Reader.Tests," +
"PublicKey=002400000480000094000000060200000024000052534131000400000100010015bc58aa0b350eca7b7b843cf98484bdc92d23f0a5d6e05f0154594704ddd00702d0cce75db773558ef42de4efa4b54557d5cbcd1a842c58e5a6d3639cec008517150a1ef4fd400b97c68a71e442441d74a82cda48aa86a358c7ab369e56257ba00ac930b2c15bc49507e9d81d6971b5de62c237ff12ea4646344142bfc474b0")]

View file

@ -185,7 +185,6 @@ namespace OoasGui
}
OpenApiDocument document = EdmModel.ConvertToOpenApi(Settings);
document.SpecVersion = Version == OpenApiSpecVersion.OpenApi2_0 ? new Version(2, 0) : new Version(3, 0, 0);
MemoryStream stream = new MemoryStream();
document.Serialize(stream, Version, Format);
stream.Flush();
@ -232,7 +231,6 @@ namespace OoasGui
using (FileStream fs = File.Create(output))
{
OpenApiDocument document = EdmModel.ConvertToOpenApi(Settings);
document.SpecVersion = Version == OpenApiSpecVersion.OpenApi2_0 ? new Version(2, 0) : new Version(3, 0, 0);
document.Serialize(fs, Version, Format);
fs.Flush();
}

View file

@ -35,8 +35,8 @@
<Reference Include="Microsoft.OData.Edm, Version=7.3.1.10814, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OData.Edm.7.3.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll</HintPath>
</Reference>
<Reference Include="Microsoft.OpenApi, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OpenApi.1.0.0-beta007\lib\net46\Microsoft.OpenApi.dll</HintPath>
<Reference Include="Microsoft.OpenApi, Version=1.0.0.0, Culture=neutral, PublicKeyToken=3f5743946376f042, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.OpenApi.1.0.0-beta008\lib\net46\Microsoft.OpenApi.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.OData.Edm" version="7.3.1" targetFramework="net461" />
<package id="Microsoft.OpenApi" version="1.0.0-beta007" targetFramework="net461" />
<package id="Microsoft.OpenApi" version="1.0.0-beta008" targetFramework="net461" />
</packages>

View file

@ -34,7 +34,6 @@ namespace Microsoft.OpenApi.OData.Generator.Tests
// Assert
Assert.NotNull(document);
Assert.Equal("3.0.0", document.SpecVersion.ToString());
Assert.NotNull(document.Info);
Assert.NotNull(document.Tags);
Assert.NotNull(document.Servers);

View file

@ -4,6 +4,8 @@
<AssemblyName>Microsoft.OpenApi.OData.Reader.Tests</AssemblyName>
<RootNamespace>Microsoft.OpenApi.OData.Reader.Tests</RootNamespace>
<TargetFramework>net46</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\src\Microsoft.OpenApi.OData.Reader.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
@ -29,7 +31,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta007" />
<PackageReference Include="Microsoft.OpenApi" Version="1.0.0-beta008" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>