diff --git a/NuGet.Config b/NuGet.Config deleted file mode 100644 index 719944369..000000000 --- a/NuGet.Config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 09872eb52..2f5a65273 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,16 +12,13 @@ variables: buildConfiguration: 'Release' steps: -- task: DotNetCoreInstaller@0 - displayName: 'Install .NET Core SDK 3.0' - inputs: - version: '3.0.100-rc1-014179' +- task: NuGetToolInstaller@1 -- task: NuGetToolInstaller@0 - displayName: 'Use NuGet 5.2.0' +- task: UseDotNet@2 + displayName: 'Use .NET Core sdk 3.0' inputs: - versionSpec: 5.2.0 - checkLatest: true + packageType: sdk + version: 3.0.100 - task: NuGetCommand@2 displayName: NuGet restore diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 53f2f4d03..c4d383ecb 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -9,9 +9,6 @@ https://www.gnu.org/licenses/gpl.html latest true - 1.0.0 - 1.0.0 - 1.0.0 true true win10-x64;win10-x86;win-x64;win-x86 @@ -61,7 +58,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index d182906cd..69041ec9c 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 71203e0c1..ed73e2384 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -19,6 +19,6 @@ - + diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 1be3c4c73..9d4a5f12a 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -23,6 +23,6 @@ - + diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 772355510..d7aaf9016 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 19ac31afb..93d76d336 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -20,7 +20,7 @@ - - + + diff --git a/src/Greenshot.Addon.Jira/JiraMonitor.cs b/src/Greenshot.Addon.Jira/JiraMonitor.cs index e74c0296c..1fbe52ba3 100644 --- a/src/Greenshot.Addon.Jira/JiraMonitor.cs +++ b/src/Greenshot.Addon.Jira/JiraMonitor.cs @@ -60,7 +60,7 @@ namespace Greenshot.Addon.Jira public void Startup() { // Subscribe the windows events which tell us a title was changed - _winEventObservable = WinEventHook.WindowTileChangeObservable() + _winEventObservable = WinEventHook.WindowTitleChangeObservable() .Select(info => User32Api.GetText(info.Handle)) .Where(title => !string.IsNullOrEmpty(title)) .Subscribe(MonitorTitleChangeEvent); diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 5699992f8..764525ff0 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index d7a02bfc9..62a5f60f9 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 47ec49ca5..0f1400907 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 595c282cd..8fa98ef30 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -16,19 +16,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 25fe57995..2907d9093 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 132f97d68..96c03526e 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -6,10 +6,10 @@ - + - - + + diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index 02dfcf616..902472f3b 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -18,9 +18,8 @@ - + - \ No newline at end of file diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 50c1f49f4..582d04e19 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 02528eb39..5183ac702 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -35,15 +35,15 @@ - + - - - + + + - - + + diff --git a/src/global.json b/src/global.json index ed6b5fc44..d2a827a50 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.0.100-preview" + "version": "3.0.100" } } \ No newline at end of file