Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Remove nuget.config and cleanup #6506

Merged
boydc2014 merged 8 commits into from
Mar 26, 2021
Merged

fix: Remove nuget.config and cleanup #6506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33cbb34
Remove nuget.config and cleanup
EricDahlvang Mar 22, 2021
55002f3
Remove copywrite headers
EricDahlvang Mar 22, 2021
10cd71e
Merge branch 'main' into eric/updateRuntimeReferences
cwhitten Mar 24, 2021
6ee67d3
Merge branch 'main' into eric/updateRuntimeReferences
boydc2014 Mar 25, 2021
fc48e2d
Add back in nuget.config
EricDahlvang Mar 25, 2021
be0b686
Merge branch 'main' into eric/updateRuntimeReferences
EricDahlvang Mar 25, 2021
1804d40
Merge branch 'main' into eric/updateRuntimeReferences
boydc2014 Mar 26, 2021
f8f6bc0
Fix bad merge
boydc2014 Mar 26, 2021
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
4 changes: 0 additions & 4 deletions runtime/dotnet/azurefunctions/MessagesTrigger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.WebJobs;
using Microsoft.Azure.WebJobs.Extensions.Http;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Extensions.Logging;
using System;
Expand Down
12 changes: 0 additions & 12 deletions runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.2-preview"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Connector" Version="4.12.2"/>
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.3" />
Expand Down
5 changes: 0 additions & 5 deletions runtime/dotnet/azurefunctions/Settings/ActivitySerializationSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Rest.Serialization;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Text;

namespace Microsoft.BotFramework.Composer.Functions.Settings
{
Expand Down
7 changes: 0 additions & 7 deletions runtime/dotnet/azurefunctions/SkillsTrigger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Azure.WebJobs;
using Microsoft.Azure.WebJobs.Extensions.Http;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Microsoft.Bot.Builder.Integration.AspNet.Core;
using Microsoft.Bot.Builder;
using System.Web.Http;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Schema;
using Microsoft.BotFramework.Composer.Functions.Settings;
Expand Down
4 changes: 0 additions & 4 deletions runtime/dotnet/azurefunctions/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Http;
using Microsoft.Azure.Functions.Extensions.DependencyInjection;
Expand All @@ -25,7 +22,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
Expand Down
4 changes: 0 additions & 4 deletions runtime/dotnet/azurewebapp/Authorization/AllowedCallersClaimsValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Security.Claims;
using System.Threading.Tasks;
using Microsoft.Bot.Connector.Authentication;
using Microsoft.BotFramework.Composer.Core.Settings;
using Microsoft.Extensions.Configuration;

namespace Microsoft.BotFramework.Composer.WebAppTemplates.Authorization
{
Expand Down
7 changes: 0 additions & 7 deletions runtime/dotnet/azurewebapp/Controllers/BotController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
//
// Generated with Bot Builder V4 SDK Template for Visual Studio EchoBot v4.3.0

using System.Threading.Tasks;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs.Debugging;
using Microsoft.Bot.Builder.Integration.AspNet.Core;

namespace Microsoft.BotFramework.Composer.WebAppTemplates.Controllers
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/azurewebapp/Controllers/SkillController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
Expand Down
12 changes: 0 additions & 12 deletions runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.12.2" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/azurewebapp/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.IO;
using Microsoft.AspNetCore.Hosting;
using Microsoft.BotFramework.Composer.Core;
Expand Down
4 changes: 0 additions & 4 deletions runtime/dotnet/azurewebapp/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.IO;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.AI.Luis;
using Microsoft.Bot.Builder.AI.QnA;
Expand Down
8 changes: 0 additions & 8 deletions runtime/dotnet/core/ComposerBot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Security.Claims;
using System.Security.Principal;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs;
using Microsoft.Bot.Builder.Dialogs.Adaptive;
using Microsoft.Bot.Builder.Dialogs.Debugging;
using Microsoft.Bot.Builder.Dialogs.Declarative;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Connector.Authentication;
using Microsoft.Bot.Schema;

namespace Microsoft.BotFramework.Composer.Core
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/core/ComposerBotPathExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Extensions.Configuration;
using System.Collections.Generic;

Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/core/ComposerSettingsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/core/LuisConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System.Collections.Generic;

namespace Microsoft.BotFramework.Composer.Core
Expand Down
22 changes: 10 additions & 12 deletions runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
<ItemGroup>
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.2-preview"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Connector" Version="4.12.2"/>
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.12.2" />
</ItemGroup>

</Project>
3 changes: 0 additions & 3 deletions runtime/dotnet/core/SkillConversationIdFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Linq;
Expand Down
5 changes: 1 addition & 4 deletions runtime/dotnet/customaction/CustomActionComponentRegistration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Dialogs.Debugging;
using Microsoft.Bot.Builder.Dialogs.Declarative;
Expand All @@ -23,4 +20,4 @@ public IEnumerable<JsonConverter> GetConverters(ResourceExplorer resourceExplore
yield break;
}
}
}
}
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/ActionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/AllowedCallersClaimsValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.Security.Claims;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/ControllingConversationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/InputsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/MessageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down
10 changes: 0 additions & 10 deletions runtime/dotnet/tests/SkillConversationIdFactoryTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using Microsoft.Bot.Builder;
using Microsoft.Bot.Builder.Adapters;
using Microsoft.Bot.Builder.Dialogs;
using Microsoft.Bot.Builder.Dialogs.Adaptive;
using Microsoft.Bot.Builder.Dialogs.Declarative;
using Microsoft.Bot.Builder.Dialogs.Declarative.Resources;
using Microsoft.Bot.Builder.Skills;
using Microsoft.Bot.Connector.Authentication;
using Microsoft.Bot.Schema;
using Microsoft.BotFramework.Composer.Core;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using System.Collections.Generic;
using System.IO;
using System.Security.Claims;
using System.Threading;
using System.Threading.Tasks;
Expand Down
3 changes: 0 additions & 3 deletions runtime/dotnet/tests/ToDoBotTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Collections.Generic;
using System.IO;
Expand Down