Prepare branch for full OSS development

LastTribunal · May 23, 2018 · 250ea0b · 250ea0b
1 parent 6fde764
commit 250ea0b
Show file tree

Hide file tree

Showing 47 changed files with 296 additions and 249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 
 # Everything in the external/packages directory as nuget packages are restored here.
-/external/packages/*
+/nuget/restored_packages/*
 
 # Build generated files in src
 /src/**/objd/**/*

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,28 @@
+## Contributing code and content
+We welcome all forms of contributions from the community. Please read the following guidelines to maximize the chances of your PR being merged.
+
+### Reporting security issues and bugs
+Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC)  [email protected]. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the [Security TechCenter](https://technet.microsoft.com/en-us/security/ff852094.aspx).
+
+### Other discussions
+For general "how-to" and guidance questions about using Service Fabric to build and run applications, please use [Stack Overflow](http://stackoverflow.com/questions/tagged/azure-service-fabric) tagged with `azure-service-fabric`.
+
+### Development process
+Please be sure to follow the usual process for submitting PRs:
+
+ - Fork the repo
+ - Create a pull request into correct branch (see branching information below).
+ - Make sure your PR title is descriptive
+ - Include a link back to an open issue in the PR description
+
+We reserve the right to close PRs that are not making progress. If no changes are made for 7 days, we'll close the PR. Closed PRs can be reopened again later and work can resume.
+
+### <a name="BranchingInformation"></a>Branching Information
+All development for future releases happen in the develop branch.
+A new branch is forked off of develop branch for each release to stabilize it before final release. (eg. release_3.1 branch represents the 3.1.* release).
+A bug fix in an already released version is made both to its release branch and to develop branch so that its available in refresh of the release and for future new releases.
+
+### Contributor License Agreement
+Before you submit a pull request, a bot will prompt you to sign the [Microsoft Contributor License Agreement](https://cla.microsoft.com/). This needs to be done only once for any Microsoft-sponsored open source project - if you've signed the Microsoft CLA for any project sponsored by Microsoft, then you are good to go for all the repos sponsored by Microsoft.
+
+ > **Important**: Note that there are **two** different CLAs commonly used by Microsoft projects: [Microsoft CLA](https://cla.microsoft.com/) and [.NET Foundation CLA](https://cla2.dotnetfoundation.org/). Service Fabric open source projects use the [Microsoft](https://cla.microsoft.com/) CLA. The .NET Foundation is treated as a separate entity, so if you've signed the .NET Foundation CLA in the past, you will still need to sign the Microsoft CLA to contribute to Service Fabric open source projects.
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ Each project can also be built individually directly through Visual Studio or by
 
 Binaries in the build are delay signed, these are fully signed in the official builds released by Microsoft. To use the binaries or to run unit tests from the build of this repository, strong name validation needs to be skipped for these assemblies. This can be done by running **SkipStrongName.ps1** script available in the root of the repository.
 
+For branches, please see [Branching Information](CONTRIBUTING.md#BranchingInformation)
+
 ## Development
 We are currently working on transitioning all development to GitHub. For the time being we are continuing to do our own development internally. Upon each release of the SDK, we will push our latest changes to GitHub. We intend to bring more of our development process and tools into the open over time.
 

diff --git a/buildAll.proj b/buildAll.proj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="RebuildAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="properties\service_fabric_common.props" />
-  <Import Project="properties\service_fabric_managed_dotnetcore.targets" />
-  <Import Project="properties\service_fabric_managed_dotnetframework.targets" />
+  <Import Project="properties\service_fabric_managed_netstandard.targets" />
+  <Import Project="properties\service_fabric_managed_netframework.targets" />
   <Import Project="properties\service_fabric_nuget.targets" />
 
   <PropertyGroup>
@@ -25,23 +25,23 @@
 
   <!-- Targets to Restore packages and project tools -->
   <Target Name="RestorePackagesProd">
-    <CallTarget Targets="RestoreProd_dotnetframework;RestoreProd_dotnetcore;" />
+    <CallTarget Targets="RestoreProd_netframework;RestoreProd_netstandard;" />
   </Target>
 
   <Target Name="RestorePackagesTest">
-    <CallTarget Targets="RestoreTest_dotnetframework" />
+    <CallTarget Targets="RestoreTest_netframework" />
   </Target>
 
   <!--Target for building product code. -->
   <Target Name="BuildProd">
     <Message Text="Building all projects ..." Importance="High"/>
-    <CallTarget Targets="BuildProd_dotnetframework;BuildProd_dotnetcore;" />
+    <CallTarget Targets="BuildProd_netframework;BuildProd_netstandard;" />
   </Target>
 
   <!--Target for copying product binaries to drop. -->
   <Target Name="CopyProdBinaries">
     <Message Text="Copying binaries to drop folder ..." Importance="High"/>
-    <CallTarget Targets="CopyProdBinaries_dotnetframework;CopyProdBinaries_dotnetcore;" />
+    <CallTarget Targets="CopyProdBinaries_netframework;CopyProdBinaries_netstandard;" />
   </Target>
 
   <!--Target for generating nuget packages. -->
@@ -52,7 +52,7 @@
   <!--Target for building test code. -->
  <Target Name="BuildTest">
     <Message Text="Building all test projects ..." Importance="High"/>
-   <CallTarget Targets="BuildTest_dotnetframework" />
+   <CallTarget Targets="BuildTest_netframework" />
   </Target>
 
   <!--Targets for cleaning product and test code. -->
@@ -74,10 +74,10 @@
   </Target>
 
   <Target Name="CleanProd">
-    <CallTarget Targets="CleanProd_dotnetframework" />
+    <CallTarget Targets="CleanProd_netframework;CleanProd_netstandard" />
   </Target>
 
    <Target Name="CleanTest">
-     <CallTarget Targets="CleanTest_dotnetframework" />
+     <CallTarget Targets="CleanTest_netframework" />
   </Target>
 </Project>
diff --git a/code.sln b/code.sln
@@ -15,17 +15,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Act
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabActUtil", "src\FabActUtil\FabActUtil.csproj", "{F6E091C3-9136-4058-91CF-57CDF383DF74}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Services_netcore", "src\netcore\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services_netcore.csproj", "{E93A1CC5-C164-4C4D-8314-A35B4B3AF633}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Services_netstandard", "src\netstandard\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services_netstandard.csproj", "{E93A1CC5-C164-4C4D-8314-A35B4B3AF633}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Services.Remoting_netcore", "src\netcore\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting_netcore.csproj", "{C6FF32EC-DCB6-4684-ACB5-4D8A9B6BB590}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Services.Remoting_netstandard", "src\netstandard\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj", "{C6FF32EC-DCB6-4684-ACB5-4D8A9B6BB590}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Actors_netcore", "src\netcore\Microsoft.ServiceFabric.Actors\Microsoft.ServiceFabric.Actors_netcore.csproj", "{997C67FC-4571-4DAC-8C2F-9BB62756AFFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Actors_netstandard", "src\netstandard\Microsoft.ServiceFabric.Actors\Microsoft.ServiceFabric.Actors_netstandard.csproj", "{997C67FC-4571-4DAC-8C2F-9BB62756AFFA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabActUtil_netcore", "src\netcore\FabActUtil\FabActUtil_netcore.csproj", "{BD88FA2D-1F61-4107-8113-8D78FB5697F3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FabActUtil_netstandard", "src\netstandard\FabActUtil\FabActUtil_netstandard.csproj", "{BD88FA2D-1F61-4107-8113-8D78FB5697F3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnetframework", "dotnetframework", "{861D6F40-D3CE-46CF-B8AD-0215B9F38BE1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnetcore", "dotnetcore", "{8B80B63B-5107-4845-9F19-647CFA7911A3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnetstandard", "dotnetstandard", "{8B80B63B-5107-4845-9F19-647CFA7911A3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2E1B4B64-112D-4D58-B156-C7E94B6D9D11}"
 	ProjectSection(SolutionItems) = preProject

diff --git a/external/NuGet.exe b/external/NuGet.exe
diff --git a/nuget.config b/nuget.config
@@ -2,13 +2,14 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="ServiceFabric_NugetPackages_LocalPath" value="refs" />
   </packageSources>
   <config>
     <!--
         Used to specify the default location to expand packages.
         See: NuGet.exe help install
         See: NuGet.exe help update
     -->
-    <add key="repositoryPath" value="external\packages" />
+    <add key="repositoryPath" value="nuget\restored_packages" />
   </config>
 </configuration>
diff --git a/nuget/NuGet.exe b/nuget/NuGet.exe
diff --git a/nuprojs/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.nuproj b/nuprojs/Microsoft.ServiceFabric.Actors.Wcf/Microsoft.ServiceFabric.Actors.Wcf.nuproj
@@ -24,10 +24,10 @@
 
     <ItemGroup>
       <Dependency Include="Microsoft.ServiceFabric.Actors">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
+        <Version>[$(NuGetPackageVersion)]</Version>
       </Dependency>
       <Dependency Include="Microsoft.ServiceFabric.Services.Wcf">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
+        <Version>[$(NuGetPackageVersion)]</Version>
       </Dependency>
     </ItemGroup>
   </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.nuproj b/nuprojs/Microsoft.ServiceFabric.Actors/Microsoft.ServiceFabric.Actors.nuproj
@@ -20,7 +20,7 @@
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Actors.xml">
         <TargetPath>lib\net45</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Actors.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Actors.dll">
         <TargetPath>ref\netstandard2.0</TargetPath>
       </File>
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Actors.dll">
@@ -35,10 +35,10 @@
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Actors.dll">
         <TargetPath>runtimes\win\lib\net471</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Actors.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Actors.dll">
         <TargetPath>runtimes\win\lib\netstandard2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_linux)Microsoft.ServiceFabric.Actors.dll">
+      <File Include="$(DropFolderNetStandard_Linux)Microsoft.ServiceFabric.Actors.dll">
         <TargetPath>runtimes\linux\lib\netstandard2.0</TargetPath>
       </File>
 
@@ -50,66 +50,63 @@
       </File>
 
       <!-- For supporting netcore project templates in VS, copy all dependencies of FabActUtil and targets file.-->
-      <File Include="$(DropFolderNetCore_win)FabActUtil.dll">
+      <File Include="$(DropFolderNetStandard_Win)FabActUtil.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Actors.targets">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Actors.targets">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Actors.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Actors.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.Remoting.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.Remoting.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
 
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.FabricTransport.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.FabricTransport.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.FabricTransport.V2.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.FabricTransport.V2.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Diagnostics.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Diagnostics.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Data.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Data.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Data.Extensions.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Data.Extensions.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Data.Interfaces.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Data.Interfaces.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.ReliableCollection.Interop.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.ReliableCollection.Interop.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Internal.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Internal.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Internal.Strings.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Internal.Strings.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)System.Fabric.dll">
+      <File Include="$(DropFolderNetStandard_Win)System.Fabric.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)System.Fabric.Management.ServiceModel.dll">
+      <File Include="$(DropFolderNetStandard_Win)System.Fabric.Management.ServiceModel.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)system.fabric.strings.dll">
+      <File Include="$(DropFolderNetStandard_Win)system.fabric.strings.dll">
         <TargetPath>build\netcoreapp2.0</TargetPath>
       </File>
     </ItemGroup>
 
     <ItemGroup>
       <Dependency Include="Microsoft.ServiceFabric.Services.Remoting">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
-      </Dependency>
-      <Dependency Include="Microsoft.ServiceFabric.Diagnostics.Internal">
-        <Version>[$(FabricSdkNuGetPackageVersionOfficial)]</Version>
+        <Version>[$(NuGetPackageVersion)]</Version>
       </Dependency>
     </ItemGroup>
   </Project>
diff --git a/...icrosoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.nuproj b/...icrosoft.ServiceFabric.Services.Remoting/Microsoft.ServiceFabric.Services.Remoting.nuproj
@@ -20,7 +20,7 @@
       <File Include="$(DropFolderNetFramework)\Microsoft.ServiceFabric.Services.Remoting.xml">
         <TargetPath>lib\net45</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.Remoting.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.Remoting.dll">
         <TargetPath>ref\netstandard2.0</TargetPath>
       </File>
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Services.Remoting.dll">
@@ -35,23 +35,20 @@
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Services.Remoting.dll">
         <TargetPath>runtimes\win\lib\net471</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.Remoting.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.Remoting.dll">
         <TargetPath>runtimes\win\lib\netstandard2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_linux)Microsoft.ServiceFabric.Services.Remoting.dll">
+      <File Include="$(DropFolderNetStandard_Linux)Microsoft.ServiceFabric.Services.Remoting.dll">
         <TargetPath>runtimes\linux\lib\netstandard2.0</TargetPath>
       </File>
     </ItemGroup>
 
     <ItemGroup>
       <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
+        <Version>[$(NuGetPackageVersion)]</Version>
       </Dependency>
       <Dependency Include="Microsoft.ServiceFabric.FabricTransport.Internal">
-        <Version>[$(FabricSdkNuGetPackageVersionOfficial)]</Version>
-      </Dependency>
-      <Dependency Include="Microsoft.ServiceFabric.Diagnostics.Internal">
-        <Version>[$(FabricSdkNuGetPackageVersionOfficial)]</Version>
+        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_FabricTransport_Internal)]</Version>
       </Dependency>
     </ItemGroup>
   </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.Services.Wcf/Microsoft.ServiceFabric.Services.Wcf.nuproj b/nuprojs/Microsoft.ServiceFabric.Services.Wcf/Microsoft.ServiceFabric.Services.Wcf.nuproj
@@ -23,11 +23,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Dependency Include="Microsoft.ServiceFabric.Services">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
-      </Dependency>
       <Dependency Include="Microsoft.ServiceFabric.Services.Remoting">
-        <Version>[$(FabricSdkNuGetPackageVersionOSS)]</Version>
+        <Version>[$(NuGetPackageVersion)]</Version>
       </Dependency>
     </ItemGroup>
   </Project>
diff --git a/nuprojs/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.nuproj b/nuprojs/Microsoft.ServiceFabric.Services/Microsoft.ServiceFabric.Services.nuproj
@@ -20,7 +20,7 @@
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Services.xml">
         <TargetPath>lib\net45</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.dll">
         <TargetPath>ref\netstandard2.0</TargetPath>
       </File>
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Services.dll">
@@ -35,20 +35,20 @@
       <File Include="$(DropFolderNetFramework)Microsoft.ServiceFabric.Services.dll">
         <TargetPath>runtimes\win\lib\net471</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_win)Microsoft.ServiceFabric.Services.dll">
+      <File Include="$(DropFolderNetStandard_Win)Microsoft.ServiceFabric.Services.dll">
         <TargetPath>runtimes\win\lib\netstandard2.0</TargetPath>
       </File>
-      <File Include="$(DropFolderNetCore_linux)Microsoft.ServiceFabric.Services.dll">
+      <File Include="$(DropFolderNetStandard_Linux)Microsoft.ServiceFabric.Services.dll">
         <TargetPath>runtimes\linux\lib\netstandard2.0</TargetPath>
       </File>
     </ItemGroup>
 
     <ItemGroup>
       <Dependency Include="Microsoft.ServiceFabric.Data">
-        <Version>[$(FabricSdkNuGetPackageVersionOfficial)]</Version>
+        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Data)]</Version>
       </Dependency>
       <Dependency Include="Microsoft.ServiceFabric.Diagnostics.Internal">
-        <Version>[$(FabricSdkNuGetPackageVersionOfficial)]</Version>
+        <Version>[$(NugetPkg_Version_Microsoft_ServiceFabric_Diagnostics_Internal)]</Version>
       </Dependency>
     </ItemGroup>
   </Project>