Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ This file should be imported by eng/Versions.props
<!-- dotnet-command-line-api dependencies -->
<SystemCommandLinePackageVersion>2.0.0-beta5.25210.1</SystemCommandLinePackageVersion>
<!-- dotnet-dotnet dependencies -->
<MicrosoftAspNetCoreAppRefPackageVersion>11.0.0-preview.6.26311.113</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>11.0.0-preview.6.26311.113</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.9.0-1.26311.113</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.9.0-1.26311.113</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.9.0-1.26311.113</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>11.0.100-preview.6.26311.113</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26311.113</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26311.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26311.113</MicrosoftNETCorePlatformsPackageVersion>
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26311.113</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>11.0.0-preview.6.26313.102</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>11.0.0-preview.6.26313.102</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.9.0-1.26313.102</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisAnalyzersPackageVersion>5.9.0-1.26313.102</MicrosoftCodeAnalysisAnalyzersPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.9.0-1.26313.102</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>11.0.100-preview.6.26313.102</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.6.26313.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>11.0.0-preview.6.26313.102</MicrosoftNETCorePlatformsPackageVersion>
<runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimelinuxarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimelinuxx64MicrosoftDotNetCdacTransportPackageVersion>
<runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimeosxarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimeosxx64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimewinarm64MicrosoftDotNetCdacTransportPackageVersion>
<runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>11.0.0-preview.6.26313.102</runtimewinx64MicrosoftDotNetCdacTransportPackageVersion>
<!-- microsoft-clrmd dependencies -->
<MicrosoftDiagnosticsRuntimePackageVersion>4.0.727102</MicrosoftDiagnosticsRuntimePackageVersion>
<MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>4.0.727102</MicrosoftDiagnosticsRuntimeUtilitiesPackageVersion>
Expand Down
62 changes: 31 additions & 31 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="50e862b8da0c82ddbf3952cfe61a8681ab93f5bc" BarId="318388" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="diagnostics" Sha="06787fc66d5364230924d00f2c5c251aeb7a31cd" BarId="318609" />
<ProductDependencies>
<Dependency Name="Microsoft.Diagnostics.Runtime" Version="4.0.727102">
<Uri>https://github.com/microsoft/clrmd</Uri>
Expand Down Expand Up @@ -32,75 +32,75 @@
<Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
</Dependency>
<!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26311.113">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<!-- Latest shared aspnetcore version updated by darc -->
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="11.0.0-preview.6.26311.113">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="11.0.0-preview.6.26311.113">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<!-- Latest shared runtime version updated by darc -->
<!-- We use platforms for the unstable package version and
the ref pack as the stable version. We need them as download links
use the unstable version, but the installed assets are all stable. -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26311.113">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26311.113">
<Dependency Name="Microsoft.NETCore.Platforms" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26311.113">
<Dependency Name="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="11.0.0-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<!--
These versions should not be used by any project that contributes to the design-time experience in VS, such as an analyzer, code-fix, or generator assembly.
Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure
they do not break the local dev experience.
-->
<Dependency Name="Microsoft.CodeAnalysis" Version="5.9.0-1.26311.113">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.9.0-1.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.9.0-1.26311.113">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.9.0-1.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0-1.26311.113">
<Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0-1.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-preview.6.26311.113">
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="11.0.100-preview.6.26313.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>50e862b8da0c82ddbf3952cfe61a8681ab93f5bc</Sha>
<Sha>06787fc66d5364230924d00f2c5c251aeb7a31cd</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
8 changes: 3 additions & 5 deletions eng/native/version/_version.c
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

#if defined(__GNUC__) && !defined(__clang__) && defined(TARGET_SUNOS)
#define RETAIN __attribute__((used))
#if defined(__GNUC__) && !defined(__clang__) && defined(TARGET_SUNOS) && defined(TARGET_AMD64)
char sccsid[] __attribute__((used, weak)) = "@(#)No version information produced";
__asm__(".pushsection .init_array; .reloc ., R_X86_64_NONE, sccsid; .popsection");
#else
#define RETAIN __attribute__((used, retain))
static char sccsid[] __attribute__((used, retain)) = "@(#)No version information produced";
#endif

static char sccsid[] RETAIN = "@(#)No version information produced";
5 changes: 3 additions & 2 deletions eng/native/version/copy_version_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ for path in "${__VersionFolder}/"*{.h,.c}; do
# update commit
commit="$(git rev-parse HEAD 2>/dev/null)"
commit="${commit:-N/A}"
substitute="$(printf 'static char sccsid[] RETAIN = "@(#)Version N/A @Commit: %s";\n' "$commit")"
version_file_contents="$(cat "$path" | sed "s|^static.*|$substitute|")"
weak_substitute="$(printf 'char sccsid[] __attribute__((used, weak)) = "@(#)Version N/A @Commit: %s";\n' "$commit")"
retain_substitute="$(printf 'static char sccsid[] __attribute__((used, retain)) = "@(#)Version N/A @Commit: %s";\n' "$commit")"
version_file_contents="$(cat "$path" | sed -e "s|^char sccsid\[\].*|$weak_substitute|" -e "s|^static char sccsid\[\].*|$retain_substitute|")"
version_file_destination="$__RepoRoot/artifacts/obj/_version.c"
current_contents=
is_placeholder_file=
Expand Down
Loading