Merge pull request #2030 from microsoft/develop

merge DEVELOP to MASTER (prep 2.15-beta3)

.github/ISSUE_TEMPLATE/auto_instrumentation_issue.md

@@ -0,0 +1,6 @@
+---
+name: Issue with Auto Instrumentation / Codeless Attach
+about: Need help with Auto Instrumentation / Codeless Attach
+---
+
+If you're using [auto-instrumentation](https://docs.microsoft.com/azure/azure-monitor/app/codeless-overview), get support from [Azure Support Center](https://azure.microsoft.com/support/create-ticket/).

.github/ISSUE_TEMPLATE/azure_application_insights_profiler.md

@@ -0,0 +1,6 @@
+---
+name: Issue with Application Insights Profiler
+about: Need help with Application Insights Profiler
+---
+
+If you're seeing issue with [Application Insights Profiler](https://docs.microsoft.com/azure/azure-monitor/app/profiler-overview), get support from [Azure Support Center](https://azure.microsoft.com/support/create-ticket/).

.github/ISSUE_TEMPLATE/azure_functions_issue.md

@@ -0,0 +1,6 @@
+---
+name: Issue with Azure Functions
+about: Need help with Azure Functions
+---
+
+If you're running the application in Azure Functions, please file an issue [here](https://github.com/Azure/azure-functions-host/issues/new/choose).

.github/ISSUE_TEMPLATE/azure_snapshot_debugger_issue.md

@@ -0,0 +1,6 @@
+---
+name: Issue with Application Insights Snapshot Debugger
+about: Need help with Application Insights Snapshot Debugger
+---
+
+If you're seeing issue with [Application Insights Snapshot Debugger](https://docs.microsoft.com/azure/azure-monitor/app/snapshot-debugger), get support from [Azure Support Center](https://azure.microsoft.com/support/create-ticket/).

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,22 +4,19 @@ about: Create a report to help us improve
 labels: bug
 ---
 
-**Describe your environment.** Describe any aspect of your environment relevant to the problem:
-* SDK version: 
-* .NET runtime version (.NET or .NET Core, TargetFramework in the .csproj file): 
-* Hosting Info (IIS/Azure WebApps/etc): 
-* Platform and OS version: 
+* List of [NuGet packages](https://github.com/microsoft/ApplicationInsights-dotnet#nuget-packages) and version that you are using:
+* Runtime version (e.g. net461, net48, netcoreapp2.1, netcoreapp3.1, etc. You can find this information from the `*.csproj` file):
+* Hosting environment (e.g. Azure Web App, App Service on Linux, Windows, Ubuntu, etc.):
 
-If you're reporting a problem with a specific version of a library in this repo, please check whether the problem has been fixed on master.
+### Describe the bug
 
-**Steps to reproduce.**
-Describe exactly how to reproduce the error. Include a code sample if applicable.
+A clear and concise description of what the bug is.
 
-**What is the expected behavior?**
-What did you expect to see?
+### To Reproduce
 
-**What is the actual behavior?**
-What did you see instead?
+Create a self-contained project using the template of your choice, apply the minimum required code to result in the issue you're observing.
 
-**Additional context.**
-Add any other context about the problem here.
+We will close this issue if:
+
+* The repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
+* If we will not be able to repro the behavior you're reporting

.github/ISSUE_TEMPLATE/question.md

@@ -4,15 +4,10 @@ about: Create a question to help us improve our knowledgebase and documentation
 labels: question
 ---
 
-**Describe your environment.**
-Describe any aspect of your environment relevant to the question:
-* SDK version: 
-* .NET runtime version (.NET or .NET Core, TargetFramework in the .csproj file): 
-* Hosting Info (IIS/Azure WebApps/etc): 
-* Platform and OS version: 
+* List of [NuGet packages](https://github.com/microsoft/ApplicationInsights-dotnet#nuget-packages) and version that you are using:
+* Runtime version (e.g. net461, net48, netcoreapp2.1, netcoreapp3.1, etc. You can find this information from the `*.csproj` file):
+* Hosting environment (e.g. Azure Web App, App Service on Linux, Windows, Ubuntu, etc.):
 
 **What are you trying to achieve?**
-What did you expect to see?
 
-**Additional context.**
-Add any other context about the problem here.
+**What have you tried so far?**

.props/Product.props

@@ -11,18 +11,15 @@
   <Import Project=".\_GlobalStaticVersion.props" />
   <Import Project=".\_Nupkg.props" />
 
-  <ItemGroup Condition=" $(OS) == 'Windows_NT' And $(Configuration) == 'Release'">
+  <ItemGroup Condition=" $(OS) == 'Windows_NT'">
     <!--Analyzers-->
-    <PackageReference Include="Desktop.Analyzers" Version="1.1.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.0.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>
@@ -37,5 +34,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <!--Removing the SRC folder from the output directory-->
+    <CorePath>$(RelativeOutputPathBase)</CorePath>
+    <OutputPath>$(BinRoot)\$(Configuration)\$(CorePath)</OutputPath>
+    <OutputPath>$([System.IO.Path]::GetFullPath( $(OutputPath) ))\</OutputPath>
+  </PropertyGroup>
 
 </Project>

.props/Test.props

@@ -8,4 +8,8 @@
   <Import Project=".\_Common.props" />
   <Import Project=".\_AnalyzerSettings.props" />
 
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
 </Project>

.props/_Common.props

@@ -15,11 +15,6 @@
 
     <!-- https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/warn-compiler-option -->
     <WarningLevel>4</WarningLevel>
-
-    <!-- TODO: NEEDS INVESTIGATION. This has some conflicts with the functional test apps using dirs.proj -->
-    <!-- https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/langversion-compiler-option -->
-    <!-- https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version -->
-    <!--<LangVersion>7.3</LangVersion>-->
 
   </PropertyGroup>
 

.props/_GlobalStaticVersion.props

@@ -13,7 +13,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>15</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta2</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone>beta3</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
     <PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
     <!-- 
       Date when Semantic Version was changed. 

.props/_Nupkg.props

@@ -50,10 +50,7 @@
 
   <PropertyGroup Condition="$(BuildServer) == 'true'">
     <!-- indicate that the build executes on a build/CI server -->
-    <!-- <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> -->
-
-    <!-- mapping all source paths included in the project outputs to deterministic values -->
-    <!-- <DeterministicSourcePaths>true</DeterministicSourcePaths> -->
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 
     <!-- produce an assembly whose byte-for-byte output is identical across compilations for identical inputs-->
     <Deterministic>true</Deterministic>
@@ -67,16 +64,6 @@
     <!-- <PackageTags>$(PackageTags) newTag1 newTag2</PackageTags> -->
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- Disable auto generation of package attributes. This resolves the 'Duplicate attribute' error. -->
-    <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
-    <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
-    <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
-    <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
-    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
-  </PropertyGroup>
-
   <Target Name="FixXmlDocumentation" AfterTargets="AfterBuild" DependsOnTargets="AfterBuild"  Condition="$(OS) == 'Windows_NT'">
     <!-- This target will add an English localization tag to our xml documentation file. -->
     <InjectXmlLanguage FilePath="$(OutputPath)\$(AssemblyName).XML" />