microsoft · Dmitry-Matveev · Jan 29, 2019 · Jan 29, 2019 · Jan 29, 2019
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 # Changelog 
+### Version 2.9.0
+- Update Base SDK to version 2.9.0
 
 ### Version 2.9.0-beta3
 - Update Base SDK to version 2.9.0-beta3

diff --git a/GlobalStaticVersion.props b/GlobalStaticVersion.props
@@ -8,7 +8,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>9</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta3</PreReleaseMilestone>
+    <PreReleaseMilestone></PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

diff --git a/NugetAudit.ps1 b/NugetAudit.ps1
@@ -15,7 +15,7 @@ Param(
 
 $requiredCopyright = "$([char]0x00A9) Microsoft Corporation. All rights reserved.";#"© Microsoft Corporation. All rights reserved.";
 $expectedProjectUrl = "https://go.microsoft.com/fwlink/?LinkId=392727"; # Application Insights Project Url
-$expectedLicenseUrl = "https://go.microsoft.com/fwlink/?LinkID=510709"; # Application Insights license Url
+$expectedLicense = "MIT"; # MIT license SPDX ID
 $expectedOwner = "AppInsightsSdk"; # Application Insights Nuget Account
 $expectedTags = @("Azure","Monitoring");
 
@@ -175,14 +175,13 @@ function Get-IsValidProjectUrl([xml]$nuspecXml) {
     Test-Condition ($projectUrl -eq $expectedProjectUrl) $message $requirement;
 }
 
-function Get-IsValidLicenseUrl([xml]$nuspecXml) {
-    $licenseUrl = $nuspecXml.package.metadata.licenseUrl;
+function Get-IsValidLicense([xml]$nuspecXml) {
+    $license = $nuspecXml.package.metadata.license.InnerText;
 
-    $message = "License Url: $licenseUrl";
-    $requirement = "Must match expected."
-    $recommendation = "Should not use FWLINK."
+    $message = "License Url: $license";
+    $requirement = "Must match expected."    
 
-    Test-MultiCondition ($licenseUrl -eq $expectedLicenseUrl) ($licenseUrl -notlike "*fwlink*") $message $requirement $recommendation;
+    Test-Condition ($license -eq $expectedLicense) $message $requirement;
 }
 
 function Get-IsValidLicenseAcceptance([xml]$nuspecXml) {
@@ -291,7 +290,7 @@ function Start-EvaluateNupkg ($nupkgPath) {
         Get-IsValidAuthors $nuspecXml;
         Get-IsValidOwners $nuspecXml;
         Get-IsValidProjectUrl $nuspecXml;
-        Get-IsValidLicenseUrl $nuspecXml;
+        Get-IsValidLicense $nuspecXml;
         Get-IsValidLicenseAcceptance $nuspecXml;
         Get-IsValidCopyright $nuspecXml;
         Get-IsValidLogoUrl $nuspecXml $unzipPath;

diff --git a/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
@@ -38,7 +38,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/EtwCollector/EtwCollector.csproj b/src/EtwCollector/EtwCollector.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
   </ItemGroup>
 

diff --git a/src/EventSourceListener/EventSourceListener.csproj b/src/EventSourceListener/EventSourceListener.csproj
@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/ILogger/ILogger.csproj b/src/ILogger/ILogger.csproj
@@ -41,7 +41,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.2">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Log4NetAppender/Log4NetAppender.csproj b/src/Log4NetAppender/Log4NetAppender.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/src/NLogTarget/NLogTarget.csproj b/src/NLogTarget/NLogTarget.csproj
@@ -42,7 +42,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">

diff --git a/src/Product.props b/src/Product.props
@@ -22,7 +22,7 @@
     <Owners>Microsoft,AppInsightsSdk</Owners>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageLicenseUrl>https://go.microsoft.com/fwlink/?LinkID=510709</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://go.microsoft.com/fwlink/?LinkId=392727</PackageProjectUrl>
     <PackageIconUrl>http://appanacdn.blob.core.windows.net/cdn/icons/aic.png</PackageIconUrl>
     <PackageTags>Azure Monitoring Analytics ApplicationInsights Telemetry</PackageTags>

diff --git a/src/TraceListener/TraceListener.csproj b/src/TraceListener/TraceListener.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">

diff --git a/...nosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj b/...nosticSourceListener.netcoreapp10.Tests/DiagnosticSourceListener.netcoreapp1.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj b/test/EtwCollector.Net451.Tests/EtwCollector.Net451.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="1.0.41" />
     <ProjectReference Include="..\..\src\EtwCollector\EtwCollector.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj b/test/EventSourceListener.netcoreapp10.Tests/EventSourceListener.netcoreapp10.Tests.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj b/test/Log4NetAppender.Net45.Tests/Log4NetAppender.Net45.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="log4net" Version="2.0.7" />
     <ProjectReference Include="..\..\src\Log4NetAppender\Log4NetAppender.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj b/test/Log4NetAppender.NetCoreApp10.Tests/Log4NetAppender.NetCoreApp10.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <ProjectReference Include="..\..\src\Log4NetAppender\Log4NetAppender.csproj" />
   </ItemGroup>

diff --git a/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj b/test/NLogTarget.Net45.Tests/NLogTarget.Net45.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="NLog" Version="4.4.12" />
     <ProjectReference Include="..\..\src\NLogTarget\NLogTarget.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj b/test/NLogTarget.NetCoreApp10.Tests/NLogTarget.NetCoreApp10.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="NLog" Version="4.5.0" />
     <ProjectReference Include="..\..\src\NLogTarget\NLogTarget.csproj" />
   </ItemGroup>

diff --git a/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj b/test/TraceListener.Net45.Tests/TraceListener.Net45.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="log4net" Version="2.0.5" />
     <ProjectReference Include="..\..\src\TraceListener\TraceListener.csproj" />
     <Reference Include="System.Net.Http" />

diff --git a/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj b/test/TraceListener.netcoreapp10.Tests/TraceListener.netcoreapp10.Tests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
   </ItemGroup>
 

diff --git a/test/Xdt.Tests/Xdt.Tests.csproj b/test/Xdt.Tests/Xdt.Tests.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta3" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
     <PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />