提交 b2f51fd1 编写于 作者: T Tomas Matousek

Use variables for CoreFX and CoreCLR versions

上级 65e71cf9
......@@ -44,6 +44,7 @@ XNamespace ns = @"http://schemas.microsoft.com/developer/msbuild/2003";
string SystemCollectionsImmutableVersion = doc.Descendants(ns + nameof(SystemCollectionsImmutableVersion)).Single().Value;
string SystemReflectionMetadataVersion = doc.Descendants(ns + nameof(SystemReflectionMetadataVersion)).Single().Value;
string CodeAnalysisAnalyzersVersion = doc.Descendants(ns + nameof(CodeAnalysisAnalyzersVersion)).Single().Value;
string CoreFXVersionSuffix = doc.Descendants(ns + nameof(CoreFXVersionSuffix)).Single().Value;
string MicrosoftDiaSymReaderVersion = GetExistingPackageVersion("Microsoft.DiaSymReader");
string MicrosoftDiaSymReaderPortablePdbVersion = GetExistingPackageVersion("Microsoft.DiaSymReader.PortablePdb");
......@@ -137,9 +138,10 @@ int PackFiles(string[] packageNames, string licenseUrl)
$"-prop systemCollectionsImmutableVersion=\"{SystemCollectionsImmutableVersion}\" " +
$"-prop systemReflectionMetadataVersion=\"{SystemReflectionMetadataVersion}\" " +
$"-prop codeAnalysisAnalyzersVersion=\"{CodeAnalysisAnalyzersVersion}\" " +
$"-prop coreFXVersionSuffix=\"{CoreFXVersionSuffix}\" " +
$"-prop thirdPartyNoticesPath=\"{ThirdPartyNoticesPath}\" " +
$"-prop netCompilersPropsPath=\"{NetCompilersPropsPath}\" " +
$"-prop emptyDirPath=\"{emptyDir}\"";;
$"-prop emptyDirPath=\"{emptyDir}\"";
var nugetExePath = Path.GetFullPath(Path.Combine(SolutionRoot, "nuget.exe"));
var p = new Process();
......
......@@ -12,6 +12,10 @@
<MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion>
<ManagedEsentVersion>1.9.2</ManagedEsentVersion>
<CodeAnalysisAnalyzersVersion>1.1.0</CodeAnalysisAnalyzersVersion>
<!-- Pre-release version of CoreFX dependencies (empty for release). Used e.g. in used in .nuspec files. -->
<CoreFXVersionSuffix>-rc3-24128-00</CoreFXVersionSuffix>
<!-- Pre-release version of CoreCLR dependencies (empty for release). Used e.g. to find crossgen. -->
<CoreClrVersionSuffix>-rc3-24128-00</CoreClrVersionSuffix>
</PropertyGroup>
<Choose>
......
......@@ -9,6 +9,7 @@
set -e
BIN_DIR="$( cd $1 && pwd )"
CONTAINING_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
UNAME=`uname`
......@@ -23,8 +24,10 @@ if [ -z "$RID" ]; then
fi
fi
# Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2-rc3-24128-00/tools/crossgen
VERSIONS_TARGETS=$CONTAINING_DIR/../Targets/VSL.Versions.targets
CORECLR_VERSION_SUFFIX="$(grep -o '<CoreClrVersionSuffix>.*</CoreClrVersionSuffix>' $VERSIONS_TARGETS | sed 's/ *<\/*CoreClrVersionSuffix> *//g')"
CROSSGEN_UTIL=~/.nuget/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.2$CORECLR_VERSION_SUFFIX/tools/crossgen
cd $BIN_DIR
......
......@@ -21,44 +21,44 @@ Supported Platforms:
<group targetFramework="netstandard1.3">
<dependency id="Microsoft.CodeAnalysis.Analyzers" version="$codeAnalysisAnalyzersVersion$" />
<dependency id="System.AppContext" version="4.1.0-rc3-24128-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24128-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24128-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24128-00" />
<dependency id="System.Console" version="4.0.0-rc3-24128-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24128-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24128-00" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24128-00" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24128-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24128-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24128-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24128-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24128-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24128-00" />
<dependency id="System.Linq.Expressions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection.Metadata" version="1.3.0-rc3-24128-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24128-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24128-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24128-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24128-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0-rc3-24128-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24128-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24128-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24128-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24128-00" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24128-00" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24128-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24128-00" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24128-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24128-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24128-00" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24128-00" exclude="Compile" />
<dependency id="System.AppContext" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Collections" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Collections.Concurrent" version="4.0.12$coreFXVersionSuffix$" />
<dependency id="System.Collections.Immutable" version="1.2.0$coreFXVersionSuffix$" />
<dependency id="System.Console" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.Debug" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Diagnostics.Tools" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Dynamic.Runtime" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Globalization" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.IO.FileSystem" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Linq" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Linq.Expressions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection.Metadata" version="1.3.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection.Primitives" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Resources.ResourceManager" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Runtime" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Extensions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Handles" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Runtime.InteropServices" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Numerics" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Text.Encoding" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading" version="4.0.11$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Threading.Tasks" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Threading.Thread" version="4.0.0$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Xml.XDocument" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Xml.XmlDocument" version="4.0.1$coreFXVersionSuffix$" exclude="Compile" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1$coreFXVersionSuffix$" exclude="Compile" />
</group>
</dependencies>
......
......@@ -18,25 +18,25 @@
<dependencies>
<dependency id="Microsoft.CodeAnalysis.Common" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc3-24128-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24128-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24128-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24128-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24128-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24128-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24128-00" />
<dependency id="System.IO" version="4.1.0-rc3-24128-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24128-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24128-00" />
<dependency id="System.Linq.Expressions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection.Extensions" version="4.0.1-rc3-24128-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24128-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24128-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24128-00" />
<dependency id="System.AppContext" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Collections" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Collections.Immutable" version="1.2.0$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.Debug" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.Tools" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Globalization" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.IO" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.IO.FileSystem" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Linq" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Linq.Expressions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection.Extensions" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Resources.ResourceManager" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Runtime" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Extensions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.InteropServices" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Threading" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading.Tasks" version="4.0.11$coreFXVersionSuffix$" />
</dependencies>
</metadata>
<files>
......
......@@ -19,7 +19,7 @@
<group targetFramework="NETCoreApp1.0">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" />
<dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" />
<dependency id="NETStandard.Library" version="1.6.0-rc3-24128-00" />
<dependency id="NETStandard.Library" version="1.6.0$coreFXVersionSuffix$" />
</group>
</dependencies>
</metadata>
......
......@@ -19,44 +19,44 @@
<dependencies>
<group targetFramework="NETCoreApp1.0">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
<dependency id="System.AppContext" version="4.1.0-rc3-24128-00" />
<dependency id="System.Collections" version="4.0.11-rc3-24128-00" />
<dependency id="System.Collections.Concurrent" version="4.0.12-rc3-24128-00" />
<dependency id="System.Collections.Immutable" version="1.2.0-rc3-24128-00" />
<dependency id="System.Console" version="4.0.0-rc3-24128-00" />
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc3-24128-00" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0-rc3-24128-00" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1-rc3-24128-00" />
<dependency id="System.Diagnostics.Tools" version="4.0.1-rc3-24128-00" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc3-24128-00" />
<dependency id="System.Globalization" version="4.0.11-rc3-24128-00" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc3-24128-00" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1-rc3-24128-00" />
<dependency id="System.Linq" version="4.1.0-rc3-24128-00" />
<dependency id="System.Linq.Expressions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection" version="4.1.0-rc3-24128-00" />
<dependency id="System.Reflection.Primitives" version="4.0.1-rc3-24128-00" />
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc3-24128-00" />
<dependency id="System.Runtime" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Extensions" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Handles" version="4.0.1-rc3-24128-00" />
<dependency id="System.Runtime.InteropServices" version="4.1.0-rc3-24128-00" />
<dependency id="System.Runtime.Loader" version="4.0.0-rc3-24128-00" />
<dependency id="System.Runtime.Numerics" version="4.0.1-rc3-24128-00" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0-rc3-24128-00" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0-rc3-24128-00" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0-rc3-24128-00" />
<dependency id="System.Text.Encoding" version="4.0.11-rc3-24128-00" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1-rc3-24128-00" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading.Tasks" version="4.0.11-rc3-24128-00" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1-rc3-24128-00" />
<dependency id="System.Threading.Thread" version="4.0.0-rc3-24128-00" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc3-24128-00" />
<dependency id="System.Xml.XDocument" version="4.0.11-rc3-24128-00" />
<dependency id="System.Xml.XmlDocument" version="4.0.1-rc3-24128-00" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1-rc3-24128-00" />
<dependency id="System.AppContext" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Collections" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Collections.Concurrent" version="4.0.12$coreFXVersionSuffix$" />
<dependency id="System.Collections.Immutable" version="1.2.0$coreFXVersionSuffix$" />
<dependency id="System.Console" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.Debug" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.FileVersionInfo" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.StackTrace" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Diagnostics.Tools" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Dynamic.Runtime" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Globalization" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.IO.FileSystem" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.IO.FileSystem.Primitives" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Linq" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Linq.Expressions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Reflection.Primitives" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Resources.ResourceManager" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Runtime" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Extensions" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Handles" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Runtime.InteropServices" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Loader" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Runtime.Numerics" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.Algorithms" version="4.2.0$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.Encoding" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Security.Cryptography.X509Certificates" version="4.1.0$coreFXVersionSuffix$" />
<dependency id="System.Text.Encoding" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Text.Encoding.CodePages" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Text.Encoding.Extensions" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading.Tasks" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Threading.Tasks.Parallel" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Threading.Thread" version="4.0.0$coreFXVersionSuffix$" />
<dependency id="System.Xml.ReaderWriter" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Xml.XDocument" version="4.0.11$coreFXVersionSuffix$" />
<dependency id="System.Xml.XmlDocument" version="4.0.1$coreFXVersionSuffix$" />
<dependency id="System.Xml.XPath.XDocument" version="4.0.1$coreFXVersionSuffix$" />
</group>
</dependencies>
</metadata>
......
......@@ -39,7 +39,7 @@
</PropertyGroup>
<ItemGroup>
<!-- Workaround for https://github.com/NuGet/Home/issues/1471 -->
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0-rc3-24128-00\ref\netstandard1.5\System.Runtime.Loader.dll">
<Reference Include="$(NuGetPackageRoot)\System.Runtime.Loader\4.0.0$(CoreFXVersionSuffix)\ref\netstandard1.5\System.Runtime.Loader.dll">
<Private>False</Private>
</Reference>
</ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册